From 7cf9a8d4f9e1ea1f1d741a1b045ce63e20aa3fde Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 28 Dec 2007 18:01:20 +0000 Subject: [PATCH] Move inventory contents configuration files to bin/inventory folder --- OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 6 +++--- OpenSim/Grid/InventoryServer/InventoryManager.cs | 6 +++--- bin/{ => inventory}/Inventory_Default.xml | 0 bin/{ => inventory}/Inventory_Library.xml | 0 bin/{ => inventory}/OpenSimLibrary.xml | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename bin/{ => inventory}/Inventory_Default.xml (100%) rename bin/{ => inventory}/Inventory_Library.xml (100%) rename bin/{ => inventory}/OpenSimLibrary.xml (100%) diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index fd93b19bcf..216e13f191 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs @@ -64,7 +64,7 @@ namespace OpenSim.Framework.Communications.Cache CreateLibraryItems(); - string filePath = Path.Combine(Util.configDir(), "OpenSimLibrary.xml"); + string filePath = Path.Combine(Util.configDir(), "inventory/OpenSimLibrary.xml"); if (File.Exists(filePath)) { try @@ -74,7 +74,7 @@ namespace OpenSim.Framework.Communications.Cache } catch (XmlException e) { - MainLog.Instance.Error("INVENTORY", "Error loading " + filePath + ": " + e.ToString()); + MainLog.Instance.Error("AGENTINVENTORY", "Error loading " + filePath + ": " + e.ToString()); } } } @@ -165,4 +165,4 @@ namespace OpenSim.Framework.Communications.Cache } } } -} \ No newline at end of file +} diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs index a003ce3196..cea8f3194e 100644 --- a/OpenSim/Grid/InventoryServer/InventoryManager.cs +++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs @@ -149,10 +149,10 @@ namespace OpenSim.Grid.InventoryServer { _manager = manager; - _inventory = loadInventoryFromXmlFile("Inventory_Library.xml"); + _inventory = loadInventoryFromXmlFile("inventory/Inventory_Library.xml"); if (fixupInventory(_inventory)) { - FileStream fs = new FileStream("Inventory_Library.xml", FileMode.Truncate, FileAccess.Write); + FileStream fs = new FileStream("inventory/Inventory_Library.xml", FileMode.Truncate, FileAccess.Write); saveInventoryToStream(_inventory, fs); fs.Flush(); fs.Close(); @@ -207,4 +207,4 @@ namespace OpenSim.Grid.InventoryServer } } } -} \ No newline at end of file +} diff --git a/bin/Inventory_Default.xml b/bin/inventory/Inventory_Default.xml similarity index 100% rename from bin/Inventory_Default.xml rename to bin/inventory/Inventory_Default.xml diff --git a/bin/Inventory_Library.xml b/bin/inventory/Inventory_Library.xml similarity index 100% rename from bin/Inventory_Library.xml rename to bin/inventory/Inventory_Library.xml diff --git a/bin/OpenSimLibrary.xml b/bin/inventory/OpenSimLibrary.xml similarity index 100% rename from bin/OpenSimLibrary.xml rename to bin/inventory/OpenSimLibrary.xml