From 7cf9a8d4f9e1ea1f1d741a1b045ce63e20aa3fde Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 28 Dec 2007 18:01:20 +0000
Subject: Move inventory contents configuration files to bin/inventory folder
---
.../Communications/Cache/LibraryRootFolder.cs | 6 +-
OpenSim/Grid/InventoryServer/InventoryManager.cs | 6 +-
bin/Inventory_Default.xml | 62 ---
bin/Inventory_Library.xml | 144 -----
bin/OpenSimLibrary.xml | 603 ---------------------
bin/inventory/Inventory_Default.xml | 62 +++
bin/inventory/Inventory_Library.xml | 144 +++++
bin/inventory/OpenSimLibrary.xml | 603 +++++++++++++++++++++
8 files changed, 815 insertions(+), 815 deletions(-)
delete mode 100644 bin/Inventory_Default.xml
delete mode 100644 bin/Inventory_Library.xml
delete mode 100644 bin/OpenSimLibrary.xml
create mode 100644 bin/inventory/Inventory_Default.xml
create mode 100644 bin/inventory/Inventory_Library.xml
create mode 100644 bin/inventory/OpenSimLibrary.xml
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_Default.xml
deleted file mode 100644
index 8d0ebc1..0000000
--- a/bin/Inventory_Default.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
- My Inventory
-
- 9
-
-
- Animations
- 20
-
-
- Body Parts
- 13
-
-
- Clothing
- 5
-
-
- Gestures
- 21
-
-
- Landmarks
- 3
-
-
- Lost And Found
- 16
-
-
- Notecards
- 7
-
-
- Objects
- 6
-
-
- Photo Album
- 15
-
-
- Scripts
- 10
-
-
- Sounds
- 1
-
-
- Textures
- 0
-
-
- Trash
- 14
-
-
-
-
diff --git a/bin/Inventory_Library.xml b/bin/Inventory_Library.xml
deleted file mode 100644
index ae28f7a..0000000
--- a/bin/Inventory_Library.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
- Library
-
-
-
- 9
- 0
-
-
- Animations
-
-
-
- 20
- 0
-
-
-
-
- Body Parts
-
-
-
- 13
- 0
-
-
-
-
- Clothing
-
-
-
- 5
- 0
-
-
-
-
- Gestures
-
-
-
- 21
- 0
-
-
-
-
- Landmarks
-
-
-
- 3
- 0
-
-
-
-
- Lost And Found
-
-
-
- 3
- 0
-
-
-
-
- Notecards
-
-
-
- 7
- 0
-
-
-
-
- Objects
-
-
-
- 6
- 0
-
-
-
-
- Photo Album
-
-
-
- 15
- 0
-
-
-
-
- Scripts
-
-
-
- 10
- 0
-
-
-
-
- Sounds
-
-
-
- 1
- 0
-
-
-
-
- Textures
-
-
-
- 0
- 0
-
-
-
-
- Accessories
-
-
-
- 8
- 0
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/OpenSimLibrary.xml b/bin/OpenSimLibrary.xml
deleted file mode 100644
index 3421a4a..0000000
--- a/bin/OpenSimLibrary.xml
+++ /dev/null
@@ -1,603 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/bin/inventory/Inventory_Default.xml b/bin/inventory/Inventory_Default.xml
new file mode 100644
index 0000000..8d0ebc1
--- /dev/null
+++ b/bin/inventory/Inventory_Default.xml
@@ -0,0 +1,62 @@
+
+
+
+ My Inventory
+
+ 9
+
+
+ Animations
+ 20
+
+
+ Body Parts
+ 13
+
+
+ Clothing
+ 5
+
+
+ Gestures
+ 21
+
+
+ Landmarks
+ 3
+
+
+ Lost And Found
+ 16
+
+
+ Notecards
+ 7
+
+
+ Objects
+ 6
+
+
+ Photo Album
+ 15
+
+
+ Scripts
+ 10
+
+
+ Sounds
+ 1
+
+
+ Textures
+ 0
+
+
+ Trash
+ 14
+
+
+
+
diff --git a/bin/inventory/Inventory_Library.xml b/bin/inventory/Inventory_Library.xml
new file mode 100644
index 0000000..ae28f7a
--- /dev/null
+++ b/bin/inventory/Inventory_Library.xml
@@ -0,0 +1,144 @@
+
+
+
+ Library
+
+
+
+ 9
+ 0
+
+
+ Animations
+
+
+
+ 20
+ 0
+
+
+
+
+ Body Parts
+
+
+
+ 13
+ 0
+
+
+
+
+ Clothing
+
+
+
+ 5
+ 0
+
+
+
+
+ Gestures
+
+
+
+ 21
+ 0
+
+
+
+
+ Landmarks
+
+
+
+ 3
+ 0
+
+
+
+
+ Lost And Found
+
+
+
+ 3
+ 0
+
+
+
+
+ Notecards
+
+
+
+ 7
+ 0
+
+
+
+
+ Objects
+
+
+
+ 6
+ 0
+
+
+
+
+ Photo Album
+
+
+
+ 15
+ 0
+
+
+
+
+ Scripts
+
+
+
+ 10
+ 0
+
+
+
+
+ Sounds
+
+
+
+ 1
+ 0
+
+
+
+
+ Textures
+
+
+
+ 0
+ 0
+
+
+
+
+ Accessories
+
+
+
+ 8
+ 0
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/bin/inventory/OpenSimLibrary.xml b/bin/inventory/OpenSimLibrary.xml
new file mode 100644
index 0000000..3421a4a
--- /dev/null
+++ b/bin/inventory/OpenSimLibrary.xml
@@ -0,0 +1,603 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.1