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.

---
 .../Inventory/InventoryServiceConnector.cs         | 49 +++++++++++++++-------
 1 file changed, 34 insertions(+), 15 deletions(-)

(limited to 'OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs')

diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index e41b427..4907015 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -163,21 +163,21 @@ namespace OpenSim.Services.Connectors
         /// <returns></returns>
         public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID)
         {
-            // !!! Not just yet.
-            //try
-            //{
-            //    List<InventoryFolderBase> folders = SynchronousRestSessionObjectPoster<Guid, List<InventoryFolderBase>>.BeginPostObject(
-            //        "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString());
-            //    Dictionary<AssetType, InventoryFolderBase> dFolders = new Dictionary<AssetType, InventoryFolderBase>();
-            //    foreach (InventoryFolderBase f in folders)
-            //        dFolders[(AssetType)f.Type] = f;
-            //    return dFolders;
-            //}
-            //catch (Exception e)
-            //{
-            //    m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}",
-            //         e.Source, e.Message);
-            //}
+            try
+            {
+                List<InventoryFolderBase> folders = SynchronousRestSessionObjectPoster<Guid, List<InventoryFolderBase>>.BeginPostObject(
+                    "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString());
+
+                Dictionary<AssetType, InventoryFolderBase> dFolders = new Dictionary<AssetType, InventoryFolderBase>();
+                foreach (InventoryFolderBase f in folders)
+                    dFolders[(AssetType)f.Type] = f;
+                return dFolders;
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}",
+                     e.Source, e.Message);
+            }
 
             return new Dictionary<AssetType, InventoryFolderBase>();
         }
@@ -348,6 +348,25 @@ namespace OpenSim.Services.Connectors
             return null;
         }
 
+        public int GetAssetPermissions(string userID, UUID assetID, UUID sessionID)
+        {
+            try
+            {
+                InventoryItemBase item = new InventoryItemBase();
+                item.Owner = new UUID(userID);
+                item.AssetID = assetID;
+                return SynchronousRestSessionObjectPoster<InventoryItemBase, int>.BeginPostObject(
+                    "POST", m_ServerURI + "/AssetPermissions/", item, sessionID.ToString(), userID);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[INVENTORY CONNECTOR]: AssetPermissions operation failed, {0} {1}",
+                     e.Source, e.Message);
+            }
+
+            return 0;
+        }
+
         #endregion
 
         /// <summary>
-- 
cgit v1.1