diff options
author | Justin Clark-Casey (justincc) | 2010-06-11 21:52:43 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-11 21:55:18 +0100 |
commit | 3525195bc9b5fdfd9799411edd452981ef1f4ebd (patch) | |
tree | b1749b64b68def578c061496a9be8d3641e215a0 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-3525195bc9b5fdfd9799411edd452981ef1f4ebd.zip opensim-SC_OLD-3525195bc9b5fdfd9799411edd452981ef1f4ebd.tar.gz opensim-SC_OLD-3525195bc9b5fdfd9799411edd452981ef1f4ebd.tar.bz2 opensim-SC_OLD-3525195bc9b5fdfd9799411edd452981ef1f4ebd.tar.xz |
Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)
This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood.
This is in line with other methods that alraedy allow requests via uuid
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 277060d..b1e21a1 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |||
@@ -250,7 +250,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
250 | } | 250 | } |
251 | 251 | ||
252 | 252 | ||
253 | public bool DeleteItems(UUID ownerID, List<UUID> itemIDs) | 253 | public bool DeleteItems(UUID ownerID, List<UUID> itemIDs) |
254 | { | 254 | { |
255 | if (itemIDs == null) | 255 | if (itemIDs == null) |
256 | return false; | 256 | return false; |
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
260 | return m_RemoteConnector.DeleteItems(ownerID, itemIDs); | 260 | return m_RemoteConnector.DeleteItems(ownerID, itemIDs); |
261 | } | 261 | } |
262 | 262 | ||
263 | public InventoryItemBase GetItem(InventoryItemBase item) | 263 | public InventoryItemBase GetItem(InventoryItemBase item) |
264 | { | 264 | { |
265 | m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID); | 265 | m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID); |
266 | if (item == null) | 266 | if (item == null) |
@@ -271,7 +271,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
271 | return m_RemoteConnector.GetItem(item); | 271 | return m_RemoteConnector.GetItem(item); |
272 | } | 272 | } |
273 | 273 | ||
274 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) | 274 | public InventoryFolderBase GetFolder(UUID folderId, UUID userId) |
275 | { | ||
276 | return GetFolder(new InventoryFolderBase(folderId, userId)); | ||
277 | } | ||
278 | |||
279 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) | ||
275 | { | 280 | { |
276 | m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID); | 281 | m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID); |
277 | if (folder == null) | 282 | if (folder == null) |
@@ -280,17 +285,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
280 | return m_RemoteConnector.GetFolder(folder); | 285 | return m_RemoteConnector.GetFolder(folder); |
281 | } | 286 | } |
282 | 287 | ||
283 | public bool HasInventoryForUser(UUID userID) | 288 | public bool HasInventoryForUser(UUID userID) |
284 | { | 289 | { |
285 | return false; | 290 | return false; |
286 | } | 291 | } |
287 | 292 | ||
288 | public List<InventoryItemBase> GetActiveGestures(UUID userId) | 293 | public List<InventoryItemBase> GetActiveGestures(UUID userId) |
289 | { | 294 | { |
290 | return new List<InventoryItemBase>(); | 295 | return new List<InventoryItemBase>(); |
291 | } | 296 | } |
292 | 297 | ||
293 | public int GetAssetPermissions(UUID userID, UUID assetID) | 298 | public int GetAssetPermissions(UUID userID, UUID assetID) |
294 | { | 299 | { |
295 | return m_RemoteConnector.GetAssetPermissions(userID, assetID); | 300 | return m_RemoteConnector.GetAssetPermissions(userID, assetID); |
296 | } | 301 | } |