diff options
Diffstat (limited to 'OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | 49 |
1 files changed, 34 insertions, 15 deletions
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 | |||
163 | /// <returns></returns> | 163 | /// <returns></returns> |
164 | public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID) | 164 | public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID) |
165 | { | 165 | { |
166 | // !!! Not just yet. | 166 | try |
167 | //try | 167 | { |
168 | //{ | 168 | List<InventoryFolderBase> folders = SynchronousRestSessionObjectPoster<Guid, List<InventoryFolderBase>>.BeginPostObject( |
169 | // List<InventoryFolderBase> folders = SynchronousRestSessionObjectPoster<Guid, List<InventoryFolderBase>>.BeginPostObject( | 169 | "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString()); |
170 | // "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString()); | 170 | |
171 | // Dictionary<AssetType, InventoryFolderBase> dFolders = new Dictionary<AssetType, InventoryFolderBase>(); | 171 | Dictionary<AssetType, InventoryFolderBase> dFolders = new Dictionary<AssetType, InventoryFolderBase>(); |
172 | // foreach (InventoryFolderBase f in folders) | 172 | foreach (InventoryFolderBase f in folders) |
173 | // dFolders[(AssetType)f.Type] = f; | 173 | dFolders[(AssetType)f.Type] = f; |
174 | // return dFolders; | 174 | return dFolders; |
175 | //} | 175 | } |
176 | //catch (Exception e) | 176 | catch (Exception e) |
177 | //{ | 177 | { |
178 | // m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}", | 178 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}", |
179 | // e.Source, e.Message); | 179 | e.Source, e.Message); |
180 | //} | 180 | } |
181 | 181 | ||
182 | return new Dictionary<AssetType, InventoryFolderBase>(); | 182 | return new Dictionary<AssetType, InventoryFolderBase>(); |
183 | } | 183 | } |
@@ -348,6 +348,25 @@ namespace OpenSim.Services.Connectors | |||
348 | return null; | 348 | return null; |
349 | } | 349 | } |
350 | 350 | ||
351 | public int GetAssetPermissions(string userID, UUID assetID, UUID sessionID) | ||
352 | { | ||
353 | try | ||
354 | { | ||
355 | InventoryItemBase item = new InventoryItemBase(); | ||
356 | item.Owner = new UUID(userID); | ||
357 | item.AssetID = assetID; | ||
358 | return SynchronousRestSessionObjectPoster<InventoryItemBase, int>.BeginPostObject( | ||
359 | "POST", m_ServerURI + "/AssetPermissions/", item, sessionID.ToString(), userID); | ||
360 | } | ||
361 | catch (Exception e) | ||
362 | { | ||
363 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: AssetPermissions operation failed, {0} {1}", | ||
364 | e.Source, e.Message); | ||
365 | } | ||
366 | |||
367 | return 0; | ||
368 | } | ||
369 | |||
351 | #endregion | 370 | #endregion |
352 | 371 | ||
353 | /// <summary> | 372 | /// <summary> |