diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
deleted file mode 100644
index 5c65317a6c..0000000000
--- a/OpenSim/Grid/InventoryServer/InventoryManager.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.IO;
-using System.Reflection;
-using System.Text;
-using System.Xml;
-using System.Xml.Serialization;
-using libsecondlife;
-using log4net;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-
-namespace OpenSim.Grid.InventoryServer
-{
- public class InventoryManager
- {
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- private IInventoryData _databasePlugin;
-
- ///
- /// Adds a new inventory server plugin - user servers will be requested in the order they were loaded.
- ///
- /// The filename to the inventory server plugin DLL
- public void AddDatabasePlugin(string FileName, string dbconnect)
- {
- m_log.Info("[" + OpenInventory_Main.LogName + "]: Invenstorage: Attempting to load " + FileName);
- Assembly pluginAssembly = Assembly.LoadFrom(FileName);
-
- m_log.Info("[" + OpenInventory_Main.LogName + "]: " +
- "Invenstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
- foreach (Type pluginType in pluginAssembly.GetTypes())
- {
- if (!pluginType.IsAbstract)
- {
- Type typeInterface = pluginType.GetInterface("IInventoryData", true);
-
- if (typeInterface != null)
- {
- IInventoryData plug =
- (IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
- plug.Initialise(dbconnect);
- _databasePlugin = plug;
- m_log.Info("[" + OpenInventory_Main.LogName + "]: " +
- "Invenstorage: Added IInventoryData Interface");
- break;
- }
- }
- }
- }
-
- protected static SerializableInventory loadInventoryFromXmlFile(string fileName)
- {
- FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
- XmlReader reader = new XmlTextReader(fs);
- XmlSerializer x = new XmlSerializer(typeof (SerializableInventory));
- SerializableInventory inventory = (SerializableInventory) x.Deserialize(reader);
- fs.Close();
- fs.Dispose();
- return inventory;
- }
-
- protected static void saveInventoryToStream(SerializableInventory inventory, Stream s)
- {
- XmlTextWriter writer = new XmlTextWriter(s, Encoding.UTF8);
- writer.Formatting = Formatting.Indented;
- XmlSerializer x = new XmlSerializer(typeof (SerializableInventory));
- x.Serialize(writer, inventory);
- }
-
- protected static bool fixupFolder(SerializableInventory.SerializableFolder f,
- SerializableInventory.SerializableFolder parent)
- {
- bool modified = false;
-
- // ensure we have a valid folder id
- if (f.ID == LLUUID.Zero)
- {
- f.ID = LLUUID.Random();
- modified = true;
- }
-
- // ensure we have valid agent id
- if (f.Owner == LLUUID.Zero)
- {
- if (parent != null)
- f.Owner = parent.Owner;
- else
- f.Owner = f.ID;
- modified = true;
- }
-
- if (f.ParentID == LLUUID.Zero && parent != null)
- {
- f.ParentID = parent.ID;
- modified = true;
- }
-
-
- foreach (SerializableInventory.SerializableFolder child in f.SubFolders)
- {
- modified |= fixupFolder(child, f);
- }
-
- return modified;
- }
-
- protected static bool fixupInventory(SerializableInventory inventory)
- {
- return fixupFolder(inventory.root, null);
- }
-
- public class GetInventory : BaseStreamHandler
- {
- private SerializableInventory _inventory;
- private InventoryManager _manager;
-
- public GetInventory(InventoryManager manager)
- : base("GET", "/inventory")
- {
- _manager = manager;
-
- _inventory = loadInventoryFromXmlFile("attic/inventory/Inventory_Library.xml");
- if (fixupInventory(_inventory))
- {
- FileStream fs = new FileStream("attic/inventory/Inventory_Library.xml", FileMode.Truncate, FileAccess.Write);
- saveInventoryToStream(_inventory, fs);
- fs.Flush();
- fs.Close();
- m_log.Debug("[" + OpenInventory_Main.LogName + "]: Modified");
- }
- }
-
- private void CreateDefaultInventory(LLUUID userID)
- {
- }
-
- private byte[] GetUserInventory(LLUUID userID)
- {
- m_log.InfoFormat("[" + OpenInventory_Main.LogName + "]: Getting Inventory for user {0}", userID.ToString());
- byte[] result = new byte[] {};
-
- InventoryFolderBase fb = _manager._databasePlugin.getUserRootFolder(userID);
- if (fb == null)
- {
- m_log.InfoFormat("[" + OpenInventory_Main.LogName + "]: Inventory not found for user {0}, creating new",
- userID.ToString());
- CreateDefaultInventory(userID);
- }
-
- return result;
- }
-
- public override byte[] Handle(string path, Stream request)
- {
- byte[] result = new byte[] {};
-
- string[] parms = path.Split(new char[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
- if (parms.Length > 1)
- {
- if (string.Compare(parms[1], "library", true) == 0)
- {
- MemoryStream ms = new MemoryStream();
- saveInventoryToStream(_inventory, ms);
-
- result = ms.GetBuffer();
- Array.Resize(ref result, (int) ms.Length);
- }
- else if (string.Compare(parms[1], "user", true) == 0)
- {
- if (parms.Length > 2)
- {
- result = GetUserInventory(new LLUUID(parms[2]));
- }
- }
- }
- return result;
- }
- }
- }
-}
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index f1bd60f5f4..2279191aea 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -41,8 +41,7 @@ namespace OpenSim.Grid.InventoryServer
public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- private InventoryManager m_inventoryManager;
+
private InventoryConfig m_config;
private GridInventoryService m_inventoryService;
@@ -71,7 +70,6 @@ namespace OpenSim.Grid.InventoryServer
m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
m_inventoryService = new GridInventoryService();
- // m_inventoryManager = new InventoryManager();
m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);
m_log.Info("[" + LogName + "]: Starting HTTP server ...");
@@ -121,8 +119,6 @@ namespace OpenSim.Grid.InventoryServer
m_httpServer.AddStreamHandler(
new RestDeserialisehandler>
("POST", "/RootFolders/", m_inventoryService.GetInventorySkeleton));
-
- // httpServer.AddStreamHandler(new InventoryManager.GetInventory(m_inventoryManager));
}
private void Work()
diff --git a/bin/inventory/attic/Inventory_Default.xml b/bin/inventory/attic/Inventory_Default.xml
deleted file mode 100644
index 8d0ebc1bc0..0000000000
--- a/bin/inventory/attic/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/attic/Inventory_Library.xml b/bin/inventory/attic/Inventory_Library.xml
deleted file mode 100644
index b2b03b739f..0000000000
--- a/bin/inventory/attic/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
-
-
-
-
-
-
-