2 files changed, 22 insertions, 8 deletions

diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index b295446..0bab5aa 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -114,12 +114,12 @@ namespace OpenSim.Server.Handlers.Inventory
                     "POST", "/DeleteItem/", DeleteItems, CheckAuthSession));
 
             m_httpServer.AddStreamHandler(
-                new RestDeserialiseSecureHandler<InventoryItemBase, InventoryItemBase>(
-                    "POST", "/QueryItem/", m_InventoryService.GetItem, CheckAuthSession));
+                new RestDeserialiseSecureHandler<Guid, InventoryItemBase>(
+                    "POST", "/QueryItem/", GetItem, CheckAuthSession));
 
             m_httpServer.AddStreamHandler(
-                new RestDeserialiseSecureHandler<InventoryFolderBase, InventoryFolderBase>(
-                    "POST", "/QueryFolder/", m_InventoryService.GetFolder, CheckAuthSession));
+                new RestDeserialiseSecureHandler<Guid, InventoryFolderBase>(
+                    "POST", "/QueryFolder/", GetFolder, CheckAuthSession));
 
             m_httpServer.AddStreamHandler(
                 new RestDeserialiseTrustedHandler<Guid, bool>(
@@ -205,6 +205,16 @@ namespace OpenSim.Server.Handlers.Inventory
             return new Dictionary<AssetType, InventoryFolderBase>();
         }
 
+        public InventoryItemBase GetItem(Guid guid)
+        {
+            return m_InventoryService.GetItem(UUID.Zero, new UUID(guid));
+        }
+
+        public InventoryFolderBase GetFolder(Guid guid)
+        {
+            return m_InventoryService.GetFolder(UUID.Zero, new UUID(guid));
+        }
+
         public InventoryCollection GetFolderContent(Guid guid)
         {
             return m_InventoryService.GetFolderContent(UUID.Zero, new UUID(guid));
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 5c4e7a9..96d6451 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -566,9 +566,11 @@ namespace OpenSim.Server.Handlers.Inventory
             Dictionary<string,object> result = new Dictionary<string,object>();
             UUID id = UUID.Zero;
             UUID.TryParse(request["ID"].ToString(), out id);
+            UUID user = UUID.Zero;
+            if (request.ContainsKey("PRINCIPAL"))
+                UUID.TryParse(request["PRINCIPAL"].ToString(), out user);
 
-            InventoryItemBase item = new InventoryItemBase(id);
-            item = m_InventoryService.GetItem(item);
+            InventoryItemBase item = m_InventoryService.GetItem(user, id);
             if (item != null)
                 result["item"] = EncodeItem(item);
 
@@ -617,9 +619,11 @@ namespace OpenSim.Server.Handlers.Inventory
             Dictionary<string, object> result = new Dictionary<string, object>();
             UUID id = UUID.Zero;
             UUID.TryParse(request["ID"].ToString(), out id);
+            UUID user = UUID.Zero;
+            if (request.ContainsKey("PRINCIPAL"))
+                UUID.TryParse(request["PRINCIPAL"].ToString(), out user);
 
-            InventoryFolderBase folder = new InventoryFolderBase(id);
-            folder = m_InventoryService.GetFolder(folder);
+            InventoryFolderBase folder = m_InventoryService.GetFolder(user, id);
             if (folder != null)
                 result["folder"] = EncodeFolder(folder);