* XInventory fairly tested, including for HG. Almost ready to switch.

* Removed a few buglets and added better exception handling.

1 files changed, 0 insertions, 50 deletions

diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 16b05df..b0fee6d 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -144,8 +144,6 @@ namespace OpenSim.Server.Handlers.Asset
                         return HandleGetActiveGestures(request);
                     case "GETASSETPERMISSIONS":
                         return HandleGetAssetPermissions(request);
-                    case "GETSYSTEMFOLDERS":
-                        return HandleGetSystemFolders(request);
                 }
                 m_log.DebugFormat("[XINVENTORY HANDLER]: unknown method request: {0}", method);
             }
@@ -575,29 +573,6 @@ namespace OpenSim.Server.Handlers.Asset
             return encoding.GetBytes(xmlString);
         }
 
-        byte[] HandleGetSystemFolders(Dictionary<string, object> request)
-        {
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            UUID principal = UUID.Zero;
-            UUID.TryParse(request["PRINCIPAL"].ToString(), out principal);
-
-            Dictionary<AssetType, InventoryFolderBase> sfolders = GetSystemFolders(principal);
-            //m_log.DebugFormat("[XXX]: SystemFolders got {0} folders", sfolders.Count);
-
-            Dictionary<string, object> folders = new Dictionary<string, object>();
-            int i = 0;
-            foreach (KeyValuePair<AssetType, InventoryFolderBase> kvp in sfolders)
-            {
-                folders["folder_" + i.ToString()] = EncodeFolder(kvp.Value);
-                i++;
-            }
-            result["FOLDERS"] = folders;
-            
-            string xmlString = ServerUtils.BuildXmlResponse(result);
-            //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
-        }
 
         private Dictionary<string, object> EncodeFolder(InventoryFolderBase f)
         {
@@ -683,30 +658,5 @@ namespace OpenSim.Server.Handlers.Asset
             return item;
         }
 
-        #region Extra
-        private Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID)
-        {
-            InventoryFolderBase root = m_InventoryService.GetRootFolder(userID);
-            if (root != null)
-            {
-                InventoryCollection content = m_InventoryService.GetFolderContent(userID, root.ID);
-                if (content != null)
-                {
-                    Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>();
-                    foreach (InventoryFolderBase folder in content.Folders)
-                    {
-                        if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
-                            folders[(AssetType)folder.Type] = folder;
-                    }
-                    // Put the root folder there, as type Folder
-                    folders[AssetType.Folder] = root;
-                    return folders;
-                }
-            }
-            m_log.WarnFormat("[XINVENTORY SERVICE]: System folders for {0} not found", userID);
-            return new Dictionary<AssetType, InventoryFolderBase>();
-        }
-        #endregion
-
     }
 }