Commit by melanie :: rf020bd3206c6 /OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs:

Fix a nullref in permissions when returning objects via right-click

Commit by jhurliman :: r5e65bef80565 /OpenSim/Region/ (6 files in 4 dirs):

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Commit by dan.lake :: r62e0b53ca469 /OpenSim/ (22 files in 16 dirs):

Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.

Commit by dan.lake :: r859bc717a4fe /OpenSim/ (22 files in 15 dirs):

Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>).

Commit by melanie :: re0289bb43231 /OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs:

Flesh out the new permission method

Commit by melanie :: r734b0416deac /OpenSim/Region/ (6 files in 4 dirs):

 Unify a previous refactor of object return with the older solution. We
really don't need two methods doing the same thing, but differently.

Commit by dan.lake :: r73e9b0be725a /OpenSim/Region/ (10 files in 5 dirs):

 Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class.

This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences.

Commit by jjustincc :: ra647f5008770 /OpenSim/Framework/Servers/HttpServer/ (BaseHttpServer.cs OSHttpRequest.cs):

minor logging changes to BaseHttpServer, OSHttpRequest

Commit by jhurliman :: rb4dcdffb5094 /OpenSim/ (5 files in 5 dirs):

Fixed several unhandled exceptions and performance issues with PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time

Commit by jhurliman :: rb51f40da8f24 / (4 files in 4 dirs):

Removed the unused use_async_when_possible config variable

Commit by jhurliman :: rd722519b31e7 /OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs:

• Fixing the SimianGrid friend connector enabled detection since the friends module uses a different pattern in the .ini file

Commit by jhurliman :: r28e4302eb6c1 /bin/config-include/SimianGrid.ini:

Fixed a bad module name in SimianGrid.ini

Commit by jhurliman :: r65c1fbc14d68 /OpenSim/Region/Physics/Meshing/ (PrimMesher.cs SculptMesh.cs):

Fixing line endings

Commit by jhurliman :: r3be2b592b21d /OpenSim/ (6 files in 5 dirs):

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Commit by jhurliman :: rcffe39b95f1f /OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs:

• Fixed a bug in Simian.IsSimianEnabled (since the default module strings follow the form OpenSim.Services.Connectors.dll:SimianGridServiceConnector instead of SimianGridServiceConnector)

Commit by diva :: r45ef3e9987de /OpenSim/ (5 files in 4 dirs):

Get the local inner simulation service object to the handler so that there is no possibility of cascading requests when failures happen.

Commit by diva :: r76106e39d9cd /OpenSim/ (3 files in 2 dirs):

Restoring LoadPlugin as it was before. Justin's last change made it throw.

Commit by jhurliman :: r4e180e84e2f3 /OpenSim/ (10 files in 5 dirs):

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Commit by jhurliman :: r84459d2bc226 /OpenSim/Services/Connectors/SimianGrid/ (10 files):

Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectors

Commit by jhurliman :: r33f5d0d1e90c /OpenSim/Region/ (7 files in 6 dirs):

* UuidGatherer now tracks asset types for assets it discovers. The asset types are inferred from context

• OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file