From e3d9d5566a799fdbb4261010b97b8b04dbd7da1e Mon Sep 17 00:00:00 2001
From: BlueWall <jamesh@bluewallgroup.com>
Date: Wed, 1 May 2013 18:46:57 -0400
Subject: [PATCH] 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.
---
.../Framework/InventoryAccess/InventoryAccessModule.cs | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index eb37626e1c..e6d6cbf743 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
{
InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
folder = m_Scene.InventoryService.GetFolder(f);
+
+ if(folder.Type == 14 || folder.Type == 16)
+ {
+ // folder.Type = 6;
+ folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
+ }
}
}