aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-11 21:52:43 +0100
committerJustin Clark-Casey (justincc)2010-06-11 21:55:18 +0100
commit3525195bc9b5fdfd9799411edd452981ef1f4ebd (patch)
treeb1749b64b68def578c061496a9be8d3641e215a0 /OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-3525195bc9b5fdfd9799411edd452981ef1f4ebd.zip
opensim-SC-3525195bc9b5fdfd9799411edd452981ef1f4ebd.tar.gz
opensim-SC-3525195bc9b5fdfd9799411edd452981ef1f4ebd.tar.bz2
opensim-SC-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/SimianGrid/SimianInventoryServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs7
1 files changed, 6 insertions, 1 deletions
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