diff options
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 6 | ||||
| -rw-r--r-- | OpenSim/Grid/InventoryServer/InventoryManager.cs | 6 | ||||
| -rw-r--r-- | bin/inventory/Inventory_Default.xml (renamed from bin/Inventory_Default.xml) | 0 | ||||
| -rw-r--r-- | bin/inventory/Inventory_Library.xml (renamed from bin/Inventory_Library.xml) | 0 | ||||
| -rw-r--r-- | bin/inventory/OpenSimLibrary.xml (renamed from bin/OpenSimLibrary.xml) | 0 |
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 | |||
| 64 | 64 | ||
| 65 | CreateLibraryItems(); | 65 | CreateLibraryItems(); |
| 66 | 66 | ||
| 67 | string filePath = Path.Combine(Util.configDir(), "OpenSimLibrary.xml"); | 67 | string filePath = Path.Combine(Util.configDir(), "inventory/OpenSimLibrary.xml"); |
| 68 | if (File.Exists(filePath)) | 68 | if (File.Exists(filePath)) |
| 69 | { | 69 | { |
| 70 | try | 70 | try |
| @@ -74,7 +74,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 74 | } | 74 | } |
| 75 | catch (XmlException e) | 75 | catch (XmlException e) |
| 76 | { | 76 | { |
| 77 | MainLog.Instance.Error("INVENTORY", "Error loading " + filePath + ": " + e.ToString()); | 77 | MainLog.Instance.Error("AGENTINVENTORY", "Error loading " + filePath + ": " + e.ToString()); |
| 78 | } | 78 | } |
| 79 | } | 79 | } |
| 80 | } | 80 | } |
| @@ -165,4 +165,4 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 165 | } | 165 | } |
| 166 | } | 166 | } |
| 167 | } | 167 | } |
| 168 | } \ No newline at end of file | 168 | } |
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 | |||
| 149 | { | 149 | { |
| 150 | _manager = manager; | 150 | _manager = manager; |
| 151 | 151 | ||
| 152 | _inventory = loadInventoryFromXmlFile("Inventory_Library.xml"); | 152 | _inventory = loadInventoryFromXmlFile("inventory/Inventory_Library.xml"); |
| 153 | if (fixupInventory(_inventory)) | 153 | if (fixupInventory(_inventory)) |
| 154 | { | 154 | { |
| 155 | FileStream fs = new FileStream("Inventory_Library.xml", FileMode.Truncate, FileAccess.Write); | 155 | FileStream fs = new FileStream("inventory/Inventory_Library.xml", FileMode.Truncate, FileAccess.Write); |
| 156 | saveInventoryToStream(_inventory, fs); | 156 | saveInventoryToStream(_inventory, fs); |
| 157 | fs.Flush(); | 157 | fs.Flush(); |
| 158 | fs.Close(); | 158 | fs.Close(); |
| @@ -207,4 +207,4 @@ namespace OpenSim.Grid.InventoryServer | |||
| 207 | } | 207 | } |
| 208 | } | 208 | } |
| 209 | } | 209 | } |
| 210 | } \ No newline at end of file | 210 | } |
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 | |||