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/Services/Connectors | |
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/Services/Connectors')
3 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs index a7aa138..5a23687 100644 --- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs | |||
@@ -171,6 +171,11 @@ namespace OpenSim.Services.Connectors | |||
171 | { | 171 | { |
172 | return null; | 172 | return null; |
173 | } | 173 | } |
174 | |||
175 | public InventoryFolderBase GetFolder(UUID folderId, UUID userId) | ||
176 | { | ||
177 | return null; | ||
178 | } | ||
174 | 179 | ||
175 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) | 180 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
176 | { | 181 | { |
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs index e25e7eb..e7acb59 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | |||
@@ -431,6 +431,11 @@ namespace OpenSim.Services.Connectors | |||
431 | return null; | 431 | return null; |
432 | } | 432 | } |
433 | 433 | ||
434 | public InventoryFolderBase GetFolder(UUID folderId, UUID userId) | ||
435 | { | ||
436 | return GetFolder(new InventoryFolderBase(folderId, userId)); | ||
437 | } | ||
438 | |||
434 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) | 439 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
435 | { | 440 | { |
436 | try | 441 | try |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index dc68259..6bf43d5 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -314,6 +314,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
314 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found"); | 314 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found"); |
315 | return null; | 315 | return null; |
316 | } | 316 | } |
317 | |||
318 | public InventoryFolderBase GetFolder(UUID folderId, UUID userId) | ||
319 | { | ||
320 | return GetFolder(new InventoryFolderBase(folderId, userId)); | ||
321 | } | ||
317 | 322 | ||
318 | /// <summary> | 323 | /// <summary> |
319 | /// Get a folder, given by its UUID | 324 | /// Get a folder, given by its UUID |