diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 7 | ||||
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index d4a929c..c2002a3 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 | |||
187 | InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId); | 187 | InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId); |
188 | InventoryFolderBase folder = m_Scene.InventoryService.GetFolder(f); | 188 | InventoryFolderBase folder = m_Scene.InventoryService.GetFolder(f); |
189 | 189 | ||
190 | if (folder == null) | ||
191 | { | ||
192 | folder = m_Scene.InventoryService.GetFolderForType(remoteClient.AgentId, (FolderType)invType); | ||
193 | if (folder != null) | ||
194 | m_log.DebugFormat("[INVENTORY ACCESS MODULE]: Requested folder not found but found folder for type {0}", invType); | ||
195 | } | ||
196 | |||
190 | if (folder == null || folder.Owner != remoteClient.AgentId) | 197 | if (folder == null || folder.Owner != remoteClient.AgentId) |
191 | return; | 198 | return; |
192 | 199 | ||
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 | |||
219 | // position). | 219 | // position). |
220 | // | 220 | // |
221 | // Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate(). | 221 | // Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate(). |
222 | |||
222 | return PhysicsScene.Simulate((float)elapsed); | 223 | return PhysicsScene.Simulate((float)elapsed); |
223 | } | 224 | } |
224 | 225 | ||