3 files changed, 63 insertions, 70 deletions

diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index c3e3a28..db9a864 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Grid.InventoryServer
     /// </summary>
     public class GridInventoryService : InventoryServiceBase
     {
-        private static readonly ILog m_log
+        private static readonly ILog m_log 
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback)
@@ -55,7 +55,7 @@ namespace OpenSim.Grid.InventoryServer
         /// <param name="itemsList"></param>
         /// <returns>true if the inventory was retrieved, false otherwise</returns>
         private bool GetUsersInventory(LLUUID userID, out List<InventoryFolderBase> folderList,
-                                       out List<InventoryItemBase> itemsList)
+                                          out List<InventoryItemBase> itemsList)
         {
             List<InventoryFolderBase> allFolders = GetInventorySkeleton(userID);
             List<InventoryItemBase> allItems = new List<InventoryItemBase>();
@@ -109,28 +109,28 @@ namespace OpenSim.Grid.InventoryServer
         {
             // uncomment me to simulate an overloaded inventory server
             //Thread.Sleep(20000);
-
+            
             LLUUID userID = new LLUUID(rawUserID);
 
-            m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID);
+            m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID);            
 
             InventoryCollection invCollection = new InventoryCollection();
-
+            
             List<InventoryFolderBase> allFolders = GetInventorySkeleton(userID);
-
+            
             if (null == allFolders)
             {
                 m_log.WarnFormat("[GRID AGENT INVENTORY]: No inventory found for user {0}", rawUserID);
-
+                
                 return invCollection;
             }
-
+            
             List<InventoryItemBase> allItems = new List<InventoryItemBase>();
 
             foreach (InventoryFolderBase folder in allFolders)
             {
                 List<InventoryItemBase> items = RequestFolderItems(folder.ID);
-
+                
                 if (items != null)
                 {
                     allItems.InsertRange(0, items);
@@ -138,9 +138,9 @@ namespace OpenSim.Grid.InventoryServer
             }
 
             invCollection.UserID = userID;
-            invCollection.Folders = allFolders;
-            invCollection.Items = allItems;
-
+            invCollection.Folders = allFolders;            
+            invCollection.Items = allItems;            
+            
 //            foreach (InventoryFolderBase folder in invCollection.Folders)
 //            {
 //                m_log.DebugFormat("[GRID AGENT INVENTORY]: Sending back folder {0} {1}", folder.Name, folder.ID);
@@ -150,14 +150,14 @@ namespace OpenSim.Grid.InventoryServer
 //            {
 //                m_log.DebugFormat("[GRID AGENT INVENTORY]: Sending back item {0} {1}, folder {2}", item.Name, item.ID, item.Folder);
 //            }
-
+            
             m_log.InfoFormat(
                 "[GRID AGENT INVENTORY]: Sending back inventory response to user {0} containing {1} folders and {2} items",
-                invCollection.UserID, invCollection.Folders.Count, invCollection.Items.Count);
-
+                invCollection.UserID, invCollection.Folders.Count, invCollection.Items.Count);            
+                        
             return invCollection;
         }
-
+                
         /// <summary>
         /// Guid to UUID wrapper for same name IInventoryServices method
         /// </summary>
@@ -166,10 +166,10 @@ namespace OpenSim.Grid.InventoryServer
         public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID)
         {
             //Thread.Sleep(10000);
-
+            
             LLUUID userID = new LLUUID(rawUserID);
             return GetInventorySkeleton(userID);
-        }
+        }        
 
         /// <summary>
         /// Create an inventory for the given user.
@@ -196,11 +196,11 @@ namespace OpenSim.Grid.InventoryServer
         {
             MoveFolder(folder);
         }
-
+        
         public override void PurgeInventoryFolder(LLUUID userID, InventoryFolderBase folder)
         {
-            PurgeFolder(folder);
-        }
+             PurgeFolder(folder);
+        }        
 
         public override void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
         {
@@ -230,15 +230,15 @@ namespace OpenSim.Grid.InventoryServer
             MoveExistingInventoryFolder(folder);
             return true;
         }
-
+        
         public bool PurgeInventoryFolder(InventoryFolderBase folder)
         {
             m_log.InfoFormat(
                 "[GRID AGENT INVENTORY]: Purging folder {0} {1} of its contents", folder.Name, folder.ID);
-
+            
             PurgeInventoryFolder(folder.Owner, folder);
             return true;
-        }
+        }         
 
         public bool AddInventoryItem(InventoryItemBase item)
         {
@@ -267,4 +267,4 @@ namespace OpenSim.Grid.InventoryServer
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
index 350a618..5c65317 100644
--- a/OpenSim/Grid/InventoryServer/InventoryManager.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Grid.InventoryServer
             Assembly pluginAssembly = Assembly.LoadFrom(FileName);
 
             m_log.Info("[" + OpenInventory_Main.LogName + "]: " +
-                       "Invenstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
+                                     "Invenstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
             foreach (Type pluginType in pluginAssembly.GetTypes())
             {
                 if (!pluginType.IsAbstract)
@@ -68,7 +68,7 @@ namespace OpenSim.Grid.InventoryServer
                         plug.Initialise(dbconnect);
                         _databasePlugin = plug;
                         m_log.Info("[" + OpenInventory_Main.LogName + "]: " +
-                                   "Invenstorage: Added IInventoryData Interface");
+                                                 "Invenstorage: Added IInventoryData Interface");
                         break;
                     }
                 }
@@ -136,12 +136,10 @@ namespace OpenSim.Grid.InventoryServer
             return fixupFolder(inventory.root, null);
         }
 
-        #region Nested type: GetInventory
-
         public class GetInventory : BaseStreamHandler
         {
-            private readonly SerializableInventory _inventory;
-            private readonly InventoryManager _manager;
+            private SerializableInventory _inventory;
+            private InventoryManager _manager;
 
             public GetInventory(InventoryManager manager)
                 : base("GET", "/inventory")
@@ -183,7 +181,7 @@ namespace OpenSim.Grid.InventoryServer
             {
                 byte[] result = new byte[] {};
 
-                string[] parms = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
+                string[] parms = path.Split(new char[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
                 if (parms.Length > 1)
                 {
                     if (string.Compare(parms[1], "library", true) == 0)
@@ -192,7 +190,7 @@ namespace OpenSim.Grid.InventoryServer
                         saveInventoryToStream(_inventory, ms);
 
                         result = ms.GetBuffer();
-                        Array.Resize(ref result, (int) ms.Length);
+                        Array.Resize<byte>(ref result, (int) ms.Length);
                     }
                     else if (string.Compare(parms[1], "user", true) == 0)
                     {
@@ -205,7 +203,5 @@ namespace OpenSim.Grid.InventoryServer
                 return result;
             }
         }
-
-        #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 453d64d..870997b 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -40,38 +40,13 @@ namespace OpenSim.Grid.InventoryServer
 {
     public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback
     {
-        public const string LogName = "INVENTORY";
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private InventoryConfig m_config;
         private InventoryManager m_inventoryManager;
+        private InventoryConfig m_config;
         private GridInventoryService m_inventoryService;
 
-        public OpenInventory_Main()
-        {
-            m_console = new ConsoleBase(LogName, this);
-            MainConsole.Instance = m_console;
-        }
-
-        #region conscmd_callback Members
-
-        public override void RunCmd(string cmd, string[] cmdparams)
-        {
-            base.RunCmd(cmd, cmdparams);
-
-            switch (cmd)
-            {
-                case "add-user":
-                    m_inventoryService.CreateUsersInventory(LLUUID.Random().UUID);
-                    break;
-                case "shutdown":
-                    m_console.Close();
-                    Environment.Exit(0);
-                    break;
-            }
-        }
-
-        #endregion
+        public const string LogName = "INVENTORY";
 
         [STAThread]
         public static void Main(string[] args)
@@ -84,6 +59,12 @@ namespace OpenSim.Grid.InventoryServer
             theServer.Work();
         }
 
+        public OpenInventory_Main()
+        {
+            m_console = new ConsoleBase(LogName, this);
+            MainConsole.Instance = m_console;
+        }
+
         public void Startup()
         {
             m_log.Info("Initialising inventory manager...");
@@ -94,7 +75,7 @@ namespace OpenSim.Grid.InventoryServer
             m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);
 
             m_log.Info("[" + LogName + "]: Starting HTTP server ...");
-
+            
             m_httpServer = new BaseHttpServer(m_config.HttpPort);
             AddHttpHandlers();
             m_httpServer.Start();
@@ -107,11 +88,11 @@ namespace OpenSim.Grid.InventoryServer
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<Guid, InventoryCollection>(
                     "POST", "/GetInventory/", m_inventoryService.GetUserInventory));
-
+            
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<Guid, bool>(
                     "POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory));
-
+            
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<InventoryFolderBase, bool>(
                     "POST", "/NewFolder/", m_inventoryService.AddInventoryFolder));
@@ -119,15 +100,15 @@ namespace OpenSim.Grid.InventoryServer
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<InventoryFolderBase, bool>(
                     "POST", "/MoveFolder/", m_inventoryService.MoveInventoryFolder));
-
+            
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<InventoryFolderBase, bool>(
-                    "POST", "/PurgeFolder/", m_inventoryService.PurgeInventoryFolder));
+                    "POST", "/PurgeFolder/", m_inventoryService.PurgeInventoryFolder));            
 
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<InventoryItemBase, bool>(
                     "POST", "/NewItem/", m_inventoryService.AddInventoryItem));
-
+            
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<InventoryItemBase, bool>(
                     "POST", "/DeleteItem/", m_inventoryService.DeleteInvItem));
@@ -153,5 +134,21 @@ namespace OpenSim.Grid.InventoryServer
                 m_console.Prompt();
             }
         }
+
+        public override void RunCmd(string cmd, string[] cmdparams)
+        {
+            base.RunCmd(cmd, cmdparams);
+            
+            switch (cmd)
+            {
+                case "add-user":
+                    m_inventoryService.CreateUsersInventory(LLUUID.Random().UUID);
+                    break;
+                case "shutdown":
+                    m_console.Close();
+                    Environment.Exit(0);
+                    break;
+            }
+        }
     }
-}
\ No newline at end of file
+}