From 9e21647011ee733cc244ea948e5beabba13e4cd3 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 16 May 2016 19:36:20 -0700 Subject: Mantis #7878 -- Landmarks were not being created in HGSuitcaseInventory --- .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 7 +++++++ OpenSim/Region/Framework/Scenes/SceneGraph.cs | 1 + 2 files changed, 8 insertions(+) (limited to 'OpenSim/Region') 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 InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId); 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) 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); } -- cgit v1.1