OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mantis #7878 -- Landmarks were not being created in HGSuitcaseInventory

LSLKeyTest
Diva Canto 2016-05-16 19:36:20 -07:00
parent 97a471cb35
commit 9e21647011
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -187,6 +187,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId); InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId);
InventoryFolderBase folder = m_Scene.InventoryService.GetFolder(f); InventoryFolderBase folder = m_Scene.InventoryService.GetFolder(f);
if (folder == null)
{
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) if (folder == null || folder.Owner != remoteClient.AgentId)
return; return;

1
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -219,6 +219,7 @@ namespace OpenSim.Region.Framework.Scenes
// position). // position).
// //
// Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate(). // Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate().
return PhysicsScene.Simulate((float)elapsed); return PhysicsScene.Simulate((float)elapsed);
} }