From e0cf45fe21d07860e7cea624392e180f38662774 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 31 Dec 2007 20:09:47 +0000 Subject: Move unused inventory files into the attic --- OpenSim/Grid/InventoryServer/InventoryManager.cs | 4 +- bin/inventory/Inventory_Default.xml | 62 ----------- bin/inventory/Inventory_Library.xml | 134 ----------------------- bin/inventory/README.txt | 2 +- bin/inventory/attic/Inventory_Default.xml | 62 +++++++++++ bin/inventory/attic/Inventory_Library.xml | 134 +++++++++++++++++++++++ 6 files changed, 199 insertions(+), 199 deletions(-) delete mode 100644 bin/inventory/Inventory_Default.xml delete mode 100644 bin/inventory/Inventory_Library.xml create mode 100644 bin/inventory/attic/Inventory_Default.xml create mode 100644 bin/inventory/attic/Inventory_Library.xml 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 { _manager = manager; - _inventory = loadInventoryFromXmlFile("inventory/Inventory_Library.xml"); + _inventory = loadInventoryFromXmlFile("attic/inventory/Inventory_Library.xml"); if (fixupInventory(_inventory)) { - FileStream fs = new FileStream("inventory/Inventory_Library.xml", FileMode.Truncate, FileAccess.Write); + FileStream fs = new FileStream("attic/inventory/Inventory_Library.xml", FileMode.Truncate, FileAccess.Write); saveInventoryToStream(_inventory, fs); fs.Flush(); fs.Close(); diff --git a/bin/inventory/Inventory_Default.xml b/bin/inventory/Inventory_Default.xml deleted file mode 100644 index 8d0ebc1..0000000 --- a/bin/inventory/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/Inventory_Library.xml b/bin/inventory/Inventory_Library.xml deleted file mode 100644 index b2b03b7..0000000 --- a/bin/inventory/Inventory_Library.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - Library - - - - 9 - 0 - - - Animations - - - - 20 - 0 - - - - - Body Parts - - - - 13 - 0 - - - - - Clothing - - - - 5 - 0 - - - - - Gestures - - - - 21 - 0 - - - - - Landmarks - - - - 3 - 0 - - - - - Notecards - - - - 7 - 0 - - - - - Objects - - - - 6 - 0 - - - - - Photo Album - - - - 15 - 0 - - - - - Scripts - - - - 10 - 0 - - - - - Sounds - - - - 1 - 0 - - - - - Textures - - - - 0 - 0 - - - - - Accessories - - - - 8 - 0 - - - - - - - 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 inventory items and folders will only need to be configured on the grid inventory server (assuming you are running in grid mode rather than standalone) -Inventory_Default.xml and Inventory_Library.xml are unused at the moment. +Files in the attic directory are currently unused. diff --git a/bin/inventory/attic/Inventory_Default.xml b/bin/inventory/attic/Inventory_Default.xml new file mode 100644 index 0000000..8d0ebc1 --- /dev/null +++ b/bin/inventory/attic/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/attic/Inventory_Library.xml b/bin/inventory/attic/Inventory_Library.xml new file mode 100644 index 0000000..b2b03b7 --- /dev/null +++ b/bin/inventory/attic/Inventory_Library.xml @@ -0,0 +1,134 @@ + + + + Library + + + + 9 + 0 + + + Animations + + + + 20 + 0 + + + + + Body Parts + + + + 13 + 0 + + + + + Clothing + + + + 5 + 0 + + + + + Gestures + + + + 21 + 0 + + + + + Landmarks + + + + 3 + 0 + + + + + Notecards + + + + 7 + 0 + + + + + Objects + + + + 6 + 0 + + + + + Photo Album + + + + 15 + 0 + + + + + Scripts + + + + 10 + 0 + + + + + Sounds + + + + 1 + 0 + + + + + Textures + + + + 0 + 0 + + + + + Accessories + + + + 8 + 0 + + + + + + + -- cgit v1.1