From e3d9d5566a799fdbb4261010b97b8b04dbd7da1e Mon Sep 17 00:00:00 2001 From: BlueWall Date: Wed, 1 May 2013 18:46:57 -0400 Subject: [PATCH 1/2] 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); + } } } From 4cb73192a78f0c8d15c2eb052c7c632bb678ce5f Mon Sep 17 00:00:00 2001 From: BlueWall Date: Wed, 1 May 2013 23:01:33 -0400 Subject: [PATCH 2/2] Make default config directory "." --- bin/Robust.HG.ini.example | 2 +- bin/Robust.ini.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index d74f2054e6..fee2a87b4b 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -35,7 +35,7 @@ ; Modular configurations ; Set path to directory for modular ini files... ; The Robust.exe process must have R/W access to the location - ConfigDirectory = "/home/opensim/etc/Configs" + ConfigDirectory = "." [ServiceList] diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index b7b2524d72..2d5aa8c87c 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -27,7 +27,7 @@ ; Modular configurations ; Set path to directory for modular ini files... ; The Robust.exe process must have R/W access to the location - ConfigDirectory = "/home/opensim/etc/Configs" + ConfigDirectory = "." [ServiceList] AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"