From 034c9cf606373bfa9d3f8040cd787f789e0efbf2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 13 Aug 2009 17:34:15 -0700
Subject: Added GetAssetPermissions. Few last bugs nixed. This is ready for
 testing.

---
 .../Server/Handlers/Inventory/InventoryServerInConnector.cs  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'OpenSim/Server/Handlers/Inventory')

diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index 63cf034..30b3cae 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -153,6 +153,11 @@ namespace OpenSim.Server.Handlers.Inventory
             m_httpServer.AddStreamHandler(
                 new RestDeserialiseTrustedHandler<Guid, List<InventoryFolderBase>>
                     ("POST", "/RootFolders/", GetInventorySkeleton, CheckTrustSource));
+
+            m_httpServer.AddStreamHandler(
+                new RestDeserialiseTrustedHandler<InventoryItemBase, int>
+                ("POST", "/AssetPermissions/", GetAssetPermissions, CheckTrustSource));
+
         }
 
         #region Wrappers for converting the Guid parameter
@@ -185,6 +190,8 @@ namespace OpenSim.Server.Handlers.Inventory
                         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;
                 }
             }
@@ -235,6 +242,11 @@ namespace OpenSim.Server.Handlers.Inventory
             return m_InventoryService.GetInventorySkeleton(userID);
         }
 
+        public int GetAssetPermissions(InventoryItemBase item)
+        {
+            return m_InventoryService.GetAssetPermissions(item.Owner, item.AssetID);
+        }
+
         #endregion
 
         /// <summary>
-- 
cgit v1.1