aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2007-12-31 20:09:47 +0000
committerJustin Clarke Casey2007-12-31 20:09:47 +0000
commite0cf45fe21d07860e7cea624392e180f38662774 (patch)
treec733ac2841b3e28ff96668d9e06522dfabd02992
parentCorrection of last commit (diff)
downloadopensim-SC_OLD-e0cf45fe21d07860e7cea624392e180f38662774.zip
opensim-SC_OLD-e0cf45fe21d07860e7cea624392e180f38662774.tar.gz
opensim-SC_OLD-e0cf45fe21d07860e7cea624392e180f38662774.tar.bz2
opensim-SC_OLD-e0cf45fe21d07860e7cea624392e180f38662774.tar.xz
Move unused inventory files into the attic
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs4
-rw-r--r--bin/inventory/README.txt2
-rw-r--r--bin/inventory/attic/Inventory_Default.xml (renamed from bin/inventory/Inventory_Default.xml)0
-rw-r--r--bin/inventory/attic/Inventory_Library.xml (renamed from bin/inventory/Inventory_Library.xml)0
4 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
index cea8f31..6ca5064 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/Inventory_Library.xml"); 152 _inventory = loadInventoryFromXmlFile("attic/inventory/Inventory_Library.xml");
153 if (fixupInventory(_inventory)) 153 if (fixupInventory(_inventory))
154 { 154 {
155 FileStream fs = new FileStream("inventory/Inventory_Library.xml", FileMode.Truncate, FileAccess.Write); 155 FileStream fs = new FileStream("attic/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();
diff --git a/bin/inventory/README.txt b/bin/inventory/README.txt
index fdbbbdc..f32f1aa 100644
--- a/bin/inventory/README.txt
+++ b/bin/inventory/README.txt
@@ -11,4 +11,4 @@ this restriction will probably be lifted in the future, at which point the
11inventory items and folders will only need to be configured on the grid inventory 11inventory items and folders will only need to be configured on the grid inventory
12server (assuming you are running in grid mode rather than standalone) 12server (assuming you are running in grid mode rather than standalone)
13 13
14Inventory_Default.xml and Inventory_Library.xml are unused at the moment. 14Files in the attic directory are currently unused.
diff --git a/bin/inventory/Inventory_Default.xml b/bin/inventory/attic/Inventory_Default.xml
index 8d0ebc1..8d0ebc1 100644
--- a/bin/inventory/Inventory_Default.xml
+++ b/bin/inventory/attic/Inventory_Default.xml
diff --git a/bin/inventory/Inventory_Library.xml b/bin/inventory/attic/Inventory_Library.xml
index b2b03b7..b2b03b7 100644
--- a/bin/inventory/Inventory_Library.xml
+++ b/bin/inventory/attic/Inventory_Library.xml