aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorDiva Canto2009-08-13 17:34:15 -0700
committerDiva Canto2009-08-13 17:34:15 -0700
commit034c9cf606373bfa9d3f8040cd787f789e0efbf2 (patch)
treef586e4a8247fdf92e730bb7a8c296559e144d0a8 /OpenSim/Server/Handlers
parentRenamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting... (diff)
downloadopensim-SC_OLD-034c9cf606373bfa9d3f8040cd787f789e0efbf2.zip
opensim-SC_OLD-034c9cf606373bfa9d3f8040cd787f789e0efbf2.tar.gz
opensim-SC_OLD-034c9cf606373bfa9d3f8040cd787f789e0efbf2.tar.bz2
opensim-SC_OLD-034c9cf606373bfa9d3f8040cd787f789e0efbf2.tar.xz
Added GetAssetPermissions. Few last bugs nixed. This is ready for testing.
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs12
1 files changed, 12 insertions, 0 deletions
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
153 m_httpServer.AddStreamHandler( 153 m_httpServer.AddStreamHandler(
154 new RestDeserialiseTrustedHandler<Guid, List<InventoryFolderBase>> 154 new RestDeserialiseTrustedHandler<Guid, List<InventoryFolderBase>>
155 ("POST", "/RootFolders/", GetInventorySkeleton, CheckTrustSource)); 155 ("POST", "/RootFolders/", GetInventorySkeleton, CheckTrustSource));
156
157 m_httpServer.AddStreamHandler(
158 new RestDeserialiseTrustedHandler<InventoryItemBase, int>
159 ("POST", "/AssetPermissions/", GetAssetPermissions, CheckTrustSource));
160
156 } 161 }
157 162
158 #region Wrappers for converting the Guid parameter 163 #region Wrappers for converting the Guid parameter
@@ -185,6 +190,8 @@ namespace OpenSim.Server.Handlers.Inventory
185 if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown)) 190 if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
186 folders[(AssetType)folder.Type] = folder; 191 folders[(AssetType)folder.Type] = folder;
187 } 192 }
193 // Put the root folder there, as type Folder
194 folders[AssetType.Folder] = root;
188 return folders; 195 return folders;
189 } 196 }
190 } 197 }
@@ -235,6 +242,11 @@ namespace OpenSim.Server.Handlers.Inventory
235 return m_InventoryService.GetInventorySkeleton(userID); 242 return m_InventoryService.GetInventorySkeleton(userID);
236 } 243 }
237 244
245 public int GetAssetPermissions(InventoryItemBase item)
246 {
247 return m_InventoryService.GetAssetPermissions(item.Owner, item.AssetID);
248 }
249
238 #endregion 250 #endregion
239 251
240 /// <summary> 252 /// <summary>