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

3 files changed, 11 insertions, 2 deletions

diff --git a/OpenSim/Framework/Monitoring/WorkManager.cs b/OpenSim/Framework/Monitoring/WorkManager.cs
index d1a74ce..a7a03a0 100644
--- a/OpenSim/Framework/Monitoring/WorkManager.cs
+++ b/OpenSim/Framework/Monitoring/WorkManager.cs
@@ -121,7 +121,8 @@ namespace OpenSim.Framework.Monitoring
             Thread thread = new Thread(start);
             thread.Priority = priority;
             thread.IsBackground = isBackground;
-
+            thread.Name = name;
+            
             Watchdog.ThreadWatchdogInfo twi
                 = new Watchdog.ThreadWatchdogInfo(thread, timeout, name)
             { AlarmIfTimeout = alarmIfTimeout, AlarmMethod = alarmMethod };
@@ -129,7 +130,7 @@ namespace OpenSim.Framework.Monitoring
             Watchdog.AddThread(twi, name, log:log);
 
             thread.Start();
-            thread.Name = name;
+
 
             return thread;
         }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index d4a929c..ba8b1ee 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -187,6 +187,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId);
             InventoryFolderBase folder = m_Scene.InventoryService.GetFolder(f);
 
+            if (folder == null && Enum.IsDefined(typeof(FolderType), (sbyte)invType))
+            {
+                folder = m_Scene.InventoryService.GetFolderForType(remoteClient.AgentId, (FolderType)invType);
+                if (folder != null)
+                    m_log.DebugFormat("[INVENTORY ACCESS MODULE]: Requested folder not found but found folder for type {0}", invType);
+            }
+
             if (folder == null || folder.Owner != remoteClient.AgentId)
                 return;
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 2ecb55b..f9f795f 100755
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -219,6 +219,7 @@ namespace OpenSim.Region.Framework.Scenes
             // position).
             //
             // Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate().
+
             return PhysicsScene.Simulate((float)elapsed);
         }