aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorBlueWall2013-05-01 18:46:57 -0400
committerBlueWall2013-05-01 18:51:43 -0400
commite3d9d5566a799fdbb4261010b97b8b04dbd7da1e (patch)
tree021048a8c04e6f8142765177a9522a6cb88971d9 /OpenSim/Region
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-e3d9d5566a799fdbb4261010b97b8b04dbd7da1e.zip
opensim-SC_OLD-e3d9d5566a799fdbb4261010b97b8b04dbd7da1e.tar.gz
opensim-SC_OLD-e3d9d5566a799fdbb4261010b97b8b04dbd7da1e.tar.bz2
opensim-SC_OLD-e3d9d5566a799fdbb4261010b97b8b04dbd7da1e.tar.xz
Fix inventory issue
Fix issue where objects rezzed from Trash or Lost And Found then be placed back in the respective folder when taking the object or a copy back into inventory.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index eb37626..e6d6cbf 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -671,6 +671,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
671 { 671 {
672 InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID); 672 InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
673 folder = m_Scene.InventoryService.GetFolder(f); 673 folder = m_Scene.InventoryService.GetFolder(f);
674
675 if(folder.Type == 14 || folder.Type == 16)
676 {
677 // folder.Type = 6;
678 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
679 }
674 } 680 }
675 } 681 }
676 682