Move inventory contents configuration files to bin/inventory folder

5 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index fd93b19..216e13f 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 a003ce3..cea8f31 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
index 8d0ebc1..8d0ebc1 100644
--- a/bin/Inventory_Default.xml
+++ b/bin/inventory/Inventory_Default.xml
diff --git a/bin/Inventory_Library.xml b/bin/inventory/Inventory_Library.xml
index ae28f7a..ae28f7a 100644
--- a/bin/Inventory_Library.xml
+++ b/bin/inventory/Inventory_Library.xml
diff --git a/bin/OpenSimLibrary.xml b/bin/inventory/OpenSimLibrary.xml
index 3421a4a..3421a4a 100644
--- a/bin/OpenSimLibrary.xml
+++ b/bin/inventory/OpenSimLibrary.xml