2 files changed, 322 insertions, 98 deletions

diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index 3c92209..1d422a7 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Server.Handlers.Inventory
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private IInventoryService m_InventoryService;
+        protected IInventoryService m_InventoryService;
 
         private bool m_doLookup = false;
 
@@ -54,11 +54,14 @@ namespace OpenSim.Server.Handlers.Inventory
         //private AuthedSessionCache m_session_cache = new AuthedSessionCache(INVENTORY_DEFAULT_SESSION_TIME);
 
         private string m_userserver_url;
-        private string m_ConfigName = "InventoryService";
+        protected string m_ConfigName = "InventoryService";
 
         public InventoryServiceInConnector(IConfigSource config, IHttpServer server, string configName) :
                 base(config, server, configName)
         {
+            if (configName != string.Empty)
+                m_ConfigName = configName;
+    
             IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
                 throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
@@ -328,46 +331,9 @@ namespace OpenSim.Server.Handlers.Inventory
         /// <param name="session_id"></param>
         /// <param name="avatar_id"></param>
         /// <returns></returns>
-        public bool CheckAuthSession(string session_id, string avatar_id)
+        public virtual bool CheckAuthSession(string session_id, string avatar_id)
         {
-            if (m_doLookup)
-            {
-                m_log.InfoFormat("[INVENTORY IN CONNECTOR]: checking authed session {0} {1}", session_id, avatar_id);
-
-                //if (m_session_cache.getCachedSession(session_id, avatar_id) == null)
-                //{
-                    // cache miss, ask userserver
-                    Hashtable requestData = new Hashtable();
-                    requestData["avatar_uuid"] = avatar_id;
-                    requestData["session_id"] = session_id;
-                    ArrayList SendParams = new ArrayList();
-                    SendParams.Add(requestData);
-                    XmlRpcRequest UserReq = new XmlRpcRequest("check_auth_session", SendParams);
-                    XmlRpcResponse UserResp = UserReq.Send(m_userserver_url, 3000);
-
-                    Hashtable responseData = (Hashtable)UserResp.Value;
-                    if (responseData.ContainsKey("auth_session") && responseData["auth_session"].ToString() == "TRUE")
-                    {
-                        m_log.Info("[INVENTORY IN CONNECTOR]: got authed session from userserver");
-                        //// add to cache; the session time will be automatically renewed
-                        //m_session_cache.Add(session_id, avatar_id);
-                        return true;
-                    }
-                //}
-                //else
-                //{
-                //    // cache hits
-                //    m_log.Info("[GRID AGENT INVENTORY]: got authed session from cache");
-                //    return true;
-                //}
-
-                    m_log.Warn("[INVENTORY IN CONNECTOR]: unknown session_id, request rejected");
-                return false;
-            }
-            else
-            {
-                return true;
-            }
+            return true;
         }
 
     }
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 7e3e68b..16b05df 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Server.Handlers.Asset
             sr.Close();
             body = body.Trim();
 
-            m_log.DebugFormat("[XXX]: query String: {0}", body);
+            //m_log.DebugFormat("[XXX]: query String: {0}", body);
 
             try
             {
@@ -144,6 +144,8 @@ 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);
             }
@@ -157,6 +159,16 @@ namespace OpenSim.Server.Handlers.Asset
 
         private byte[] FailureResult()
         {
+            return BoolResult(false);
+        }
+
+        private byte[] SuccessResult()
+        {
+            return BoolResult(true);
+        }
+
+        private byte[] BoolResult(bool value)
+        {
             XmlDocument doc = new XmlDocument();
 
             XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
@@ -170,7 +182,7 @@ namespace OpenSim.Server.Handlers.Asset
             doc.AppendChild(rootElement);
 
             XmlElement result = doc.CreateElement("", "RESULT", "");
-            result.AppendChild(doc.CreateTextNode("False"));
+            result.AppendChild(doc.CreateTextNode(value.ToString()));
 
             rootElement.AppendChild(result);
 
@@ -187,7 +199,7 @@ namespace OpenSim.Server.Handlers.Asset
 
             return ms.ToArray();
         }
-        
+
         byte[] HandleCreateUserInventory(Dictionary<string,object> request)
         {
             Dictionary<string,object> result = new Dictionary<string,object>();
@@ -201,7 +213,7 @@ namespace OpenSim.Server.Handlers.Asset
                 result["RESULT"] = "False";
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
+            //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
             UTF8Encoding encoding = new UTF8Encoding();
             return encoding.GetBytes(xmlString);
         }
@@ -216,11 +228,20 @@ namespace OpenSim.Server.Handlers.Asset
 
             List<InventoryFolderBase> folders = m_InventoryService.GetInventorySkeleton(new UUID(request["PRINCIPAL"].ToString()));
 
-            foreach (InventoryFolderBase f in folders)
-                result[f.ID.ToString()] = EncodeFolder(f);
+            Dictionary<string, object> sfolders = new Dictionary<string, object>();
+            if (folders != null)
+            {
+                int i = 0;
+                foreach (InventoryFolderBase f in folders)
+                {
+                    sfolders["folder_" + i.ToString()] = EncodeFolder(f);
+                    i++;
+                }
+            }
+            result["FOLDERS"] = sfolders;
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
+            //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
             UTF8Encoding encoding = new UTF8Encoding();
             return encoding.GetBytes(xmlString);
         }
@@ -229,8 +250,14 @@ namespace OpenSim.Server.Handlers.Asset
         {
             Dictionary<string,object> result = new Dictionary<string,object>();
 
+            UUID principal = UUID.Zero;
+            UUID.TryParse(request["PRINCIPAL"].ToString(), out principal);
+            InventoryFolderBase rfolder = m_InventoryService.GetRootFolder(principal);
+            if (rfolder != null)
+                result["folder"] = EncodeFolder(rfolder);
+
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
+            //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
             UTF8Encoding encoding = new UTF8Encoding();
             return encoding.GetBytes(xmlString);
         }
@@ -238,9 +265,16 @@ namespace OpenSim.Server.Handlers.Asset
         byte[] HandleGetFolderForType(Dictionary<string,object> request)
         {
             Dictionary<string,object> result = new Dictionary<string,object>();
+            UUID principal = UUID.Zero;
+            UUID.TryParse(request["PRINCIPAL"].ToString(), out principal);
+            int type = 0;
+            Int32.TryParse(request["TYPE"].ToString(), out type);
+            InventoryFolderBase folder = m_InventoryService.GetFolderForType(principal, (AssetType)type);
+            if (folder != null)
+                result["folder"] = EncodeFolder(folder);
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
+            //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
             UTF8Encoding encoding = new UTF8Encoding();
             return encoding.GetBytes(xmlString);
         }
@@ -248,9 +282,35 @@ namespace OpenSim.Server.Handlers.Asset
         byte[] HandleGetFolderContent(Dictionary<string,object> request)
         {
             Dictionary<string,object> result = new Dictionary<string,object>();
+            UUID principal = UUID.Zero;
+            UUID.TryParse(request["PRINCIPAL"].ToString(), out principal);
+            UUID folderID = UUID.Zero;
+            UUID.TryParse(request["FOLDER"].ToString(), out folderID);
+
+            InventoryCollection icoll = m_InventoryService.GetFolderContent(principal, folderID);
+            if (icoll != null)
+            {
+                Dictionary<string, object> folders = new Dictionary<string, object>();
+                int i = 0;
+                foreach (InventoryFolderBase f in icoll.Folders)
+                {
+                    folders["folder_" + i.ToString()] = EncodeFolder(f);
+                    i++;
+                }
+                result["FOLDERS"] = folders;
+
+                i = 0;
+                Dictionary<string, object> items = new Dictionary<string, object>();
+                foreach (InventoryItemBase it in icoll.Items)
+                {
+                    items["item_" + i.ToString()] = EncodeItem(it);
+                    i++;
+                }
+                result["ITEMS"] = items;
+            }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
+            //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
             UTF8Encoding encoding = new UTF8Encoding();
             return encoding.GetBytes(xmlString);
         }
@@ -258,9 +318,27 @@ namespace OpenSim.Server.Handlers.Asset
         byte[] HandleGetFolderItems(Dictionary<string,object> request)
         {
             Dictionary<string,object> result = new Dictionary<string,object>();
+            UUID principal = UUID.Zero;
+            UUID.TryParse(request["PRINCIPAL"].ToString(), out principal);
+            UUID folderID = UUID.Zero;
+            UUID.TryParse(request["FOLDER"].ToString(), out folderID);
 
+            List<InventoryItemBase> items = m_InventoryService.GetFolderItems(principal, folderID);
+            Dictionary<string, object> sitems = new Dictionary<string, object>();
+
+            if (items != null)
+            {
+                int i = 0;
+                foreach (InventoryItemBase item in items)
+                {
+                    sitems["item_" + i.ToString()] = EncodeItem(item);
+                    i++;
+                }
+            }
+            result["ITEMS"] = sitems;
+            
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
+            //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
             UTF8Encoding encoding = new UTF8Encoding();
             return encoding.GetBytes(xmlString);
         }
@@ -268,109 +346,189 @@ namespace OpenSim.Server.Handlers.Asset
         byte[] HandleAddFolder(Dictionary<string,object> request)
         {
             Dictionary<string,object> result = new Dictionary<string,object>();
+            InventoryFolderBase folder = BuildFolder(request);
 
-            string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            if (m_InventoryService.AddFolder(folder))
+                return SuccessResult();
+            else
+                return FailureResult();
         }
 
         byte[] HandleUpdateFolder(Dictionary<string,object> request)
         {
-            Dictionary<string,object> result = new Dictionary<string,object>();
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            InventoryFolderBase folder = BuildFolder(request);
 
-            string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            if (m_InventoryService.UpdateFolder(folder))
+                return SuccessResult();
+            else
+                return FailureResult();
         }
 
         byte[] HandleMoveFolder(Dictionary<string,object> request)
         {
-            Dictionary<string,object> result = new Dictionary<string,object>();
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            UUID parentID = UUID.Zero;
+            UUID.TryParse(request["ParentID"].ToString(), out parentID);
+            UUID folderID = UUID.Zero;
+            UUID.TryParse(request["ID"].ToString(), out folderID);
+            UUID principal = UUID.Zero;
+            UUID.TryParse(request["PRINCIPAL"].ToString(), out principal);
+
+            InventoryFolderBase folder = new InventoryFolderBase(folderID, "", principal, parentID);
+            if (m_InventoryService.MoveFolder(folder))
+                return SuccessResult();
+            else
+                return FailureResult();
 
-            string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
         }
 
         byte[] HandleDeleteFolders(Dictionary<string,object> request)
         {
             Dictionary<string,object> result = new Dictionary<string,object>();
+            UUID principal = UUID.Zero;
+            UUID.TryParse(request["PRINCIPAL"].ToString(), out principal);
+            List<string> slist = (List<string>)request["FOLDERS"];
+            List<UUID> uuids = new List<UUID>();
+            foreach (string s in slist)
+            {
+                UUID u = UUID.Zero;
+                if (UUID.TryParse(s, out u))
+                    uuids.Add(u);
+            }
 
-            string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            if (m_InventoryService.DeleteFolders(principal, uuids))
+                return SuccessResult();
+            else
+                return
+                    FailureResult();
         }
 
         byte[] HandlePurgeFolder(Dictionary<string,object> request)
         {
             Dictionary<string,object> result = new Dictionary<string,object>();
+            UUID folderID = UUID.Zero;
+            UUID.TryParse(request["ID"].ToString(), out folderID);
 
-            string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            InventoryFolderBase folder = new InventoryFolderBase(folderID);
+            if (m_InventoryService.PurgeFolder(folder))
+                return SuccessResult();
+            else
+                return FailureResult();
         }
 
         byte[] HandleAddItem(Dictionary<string,object> request)
         {
-            Dictionary<string,object> result = new Dictionary<string,object>();
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            InventoryItemBase item = BuildItem(request);
 
-            string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            if (m_InventoryService.AddItem(item))
+                return SuccessResult();
+            else
+                return FailureResult();
         }
 
         byte[] HandleUpdateItem(Dictionary<string,object> request)
         {
-            Dictionary<string,object> result = new Dictionary<string,object>();
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            InventoryItemBase item = BuildItem(request);
 
-            string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            if (m_InventoryService.UpdateItem(item))
+                return SuccessResult();
+            else
+                return FailureResult();
         }
 
         byte[] HandleMoveItems(Dictionary<string,object> request)
         {
             Dictionary<string,object> result = new Dictionary<string,object>();
+            List<string> idlist = (List<string>)request["IDLIST"];
+            List<string> destlist = (List<string>)request["DESTLIST"];
+            UUID principal = UUID.Zero;
+            UUID.TryParse(request["PRINCIPAL"].ToString(), out principal);
 
-            string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            List<InventoryItemBase> items = new List<InventoryItemBase>();
+            int n = 0;
+            try
+            {
+                foreach (string s in idlist)
+                {
+                    UUID u = UUID.Zero;
+                    if (UUID.TryParse(s, out u))
+                    {
+                        UUID fid = UUID.Zero;
+                        if (UUID.TryParse(destlist[n++], out fid))
+                        {
+                            InventoryItemBase item = new InventoryItemBase(u, principal);
+                            item.Folder = fid;
+                            items.Add(item);
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[XINVENTORY IN CONNECTOR]: Exception in HandleMoveItems: {0}", e.Message);
+                return FailureResult();
+            }
+
+            if (m_InventoryService.MoveItems(principal, items))
+                return SuccessResult();
+            else
+                return FailureResult();
         }
 
         byte[] HandleDeleteItems(Dictionary<string,object> request)
         {
-            Dictionary<string,object> result = new Dictionary<string,object>();
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            UUID principal = UUID.Zero;
+            UUID.TryParse(request["PRINCIPAL"].ToString(), out principal);
+            List<string> slist = (List<string>)request["ITEMS"];
+            List<UUID> uuids = new List<UUID>();
+            foreach (string s in slist)
+            {
+                UUID u = UUID.Zero;
+                if (UUID.TryParse(s, out u))
+                    uuids.Add(u);
+            }
 
-            string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            UTF8Encoding encoding = new UTF8Encoding();
-            return encoding.GetBytes(xmlString);
+            if (m_InventoryService.DeleteItems(principal, uuids))
+                return SuccessResult();
+            else
+                return
+                    FailureResult();
         }
 
         byte[] HandleGetItem(Dictionary<string,object> request)
         {
             Dictionary<string,object> result = new Dictionary<string,object>();
+            UUID id = UUID.Zero;
+            UUID.TryParse(request["ID"].ToString(), out id);
+
+            InventoryItemBase item = new InventoryItemBase(id);
+            item = m_InventoryService.GetItem(item);
+            if (item != null)
+                result["item"] = EncodeItem(item);
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
+            //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
             UTF8Encoding encoding = new UTF8Encoding();
             return encoding.GetBytes(xmlString);
         }
 
         byte[] HandleGetFolder(Dictionary<string,object> request)
         {
-            Dictionary<string,object> result = new Dictionary<string,object>();
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            UUID id = UUID.Zero;
+            UUID.TryParse(request["ID"].ToString(), out id);
+
+            InventoryFolderBase folder = new InventoryFolderBase(id);
+            folder = m_InventoryService.GetFolder(folder);
+            if (folder != null)
+                result["folder"] = EncodeFolder(folder);
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
+            //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
             UTF8Encoding encoding = new UTF8Encoding();
             return encoding.GetBytes(xmlString);
         }
@@ -378,9 +536,24 @@ namespace OpenSim.Server.Handlers.Asset
         byte[] HandleGetActiveGestures(Dictionary<string,object> request)
         {
             Dictionary<string,object> result = new Dictionary<string,object>();
+            UUID principal = UUID.Zero;
+            UUID.TryParse(request["PRINCIPAL"].ToString(), out principal);
+
+            List<InventoryItemBase> gestures = m_InventoryService.GetActiveGestures(principal);
+            Dictionary<string, object> items = new Dictionary<string, object>();
+            if (gestures != null)
+            {
+                int i = 0;
+                foreach (InventoryItemBase item in gestures)
+                {
+                    items["item_" + i.ToString()] = EncodeItem(item);
+                    i++;
+                }
+            }
+            result["ITEMS"] = items;
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-            m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
+            //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
             UTF8Encoding encoding = new UTF8Encoding();
             return encoding.GetBytes(xmlString);
         }
@@ -388,9 +561,40 @@ namespace OpenSim.Server.Handlers.Asset
         byte[] HandleGetAssetPermissions(Dictionary<string,object> request)
         {
             Dictionary<string,object> result = new Dictionary<string,object>();
+            UUID principal = UUID.Zero;
+            UUID.TryParse(request["PRINCIPAL"].ToString(), out principal);
+            UUID assetID = UUID.Zero;
+            UUID.TryParse(request["ASSET"].ToString(), out assetID);
 
+            int perms = m_InventoryService.GetAssetPermissions(principal, assetID);
+
+            result["RESULT"] = perms.ToString();
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            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);
+            //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
             UTF8Encoding encoding = new UTF8Encoding();
             return encoding.GetBytes(xmlString);
         }
@@ -409,6 +613,34 @@ namespace OpenSim.Server.Handlers.Asset
             return ret;
         }
 
+        private Dictionary<string, object> EncodeItem(InventoryItemBase item)
+        {
+            Dictionary<string, object> ret = new Dictionary<string, object>();
+
+            ret["AssetID"] = item.AssetID.ToString();
+            ret["AssetType"] = item.AssetType.ToString();
+            ret["BasePermissions"] = item.BasePermissions.ToString();
+            ret["CreationDate"] = item.CreationDate.ToString();
+            ret["CreatorId"] = item.CreatorId.ToString();
+            ret["CurrentPermissions"] = item.CurrentPermissions.ToString();
+            ret["Description"] = item.Description.ToString();
+            ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString();
+            ret["Flags"] = item.Flags.ToString();
+            ret["Folder"] = item.Folder.ToString();
+            ret["GroupID"] = item.GroupID.ToString();
+            ret["GroupOwned"] = item.GroupOwned.ToString();
+            ret["GroupPermissions"] = item.GroupPermissions.ToString();
+            ret["ID"] = item.ID.ToString();
+            ret["InvType"] = item.InvType.ToString();
+            ret["Name"] = item.Name.ToString();
+            ret["NextPermissions"] = item.NextPermissions.ToString();
+            ret["Owner"] = item.Owner.ToString();
+            ret["SalePrice"] = item.SalePrice.ToString();
+            ret["SaleType"] = item.SaleType.ToString();
+
+            return ret;
+        }
+
         private InventoryFolderBase BuildFolder(Dictionary<string,object> data)
         {
             InventoryFolderBase folder = new InventoryFolderBase();
@@ -450,5 +682,31 @@ 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
+
     }
 }