aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs5
-rw-r--r--OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs5
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs7
-rw-r--r--OpenSim/Services/Interfaces/IInventoryService.cs8
-rw-r--r--OpenSim/Services/InventoryService/InventoryService.cs17
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs5
6 files changed, 40 insertions, 7 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
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index 1b78fb3..b0ffd8f 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -170,6 +170,14 @@ namespace OpenSim.Services.Interfaces
170 InventoryItemBase GetItem(InventoryItemBase item); 170 InventoryItemBase GetItem(InventoryItemBase item);
171 171
172 /// <summary> 172 /// <summary>
173 /// Get a folder.
174 /// </summary>
175 /// <param name="folderId"></param>
176 /// <param name="userId"></param>
177 /// <returns></returns>
178 InventoryFolderBase GetFolder(UUID folderId, UUID userId);
179
180 /// <summary>
173 /// Get a folder, given by its UUID 181 /// Get a folder, given by its UUID
174 /// </summary> 182 /// </summary>
175 /// <param name="folder"></param> 183 /// <param name="folder"></param>
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index fbcd663..9f1c4a4 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -439,15 +439,20 @@ namespace OpenSim.Services.InventoryService
439 m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID); 439 m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID);
440 return null; 440 return null;
441 } 441 }
442 442
443 public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) 443 public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId)
444 { 444 {
445 InventoryFolderBase result = m_Database.getInventoryFolder(folder.ID); 445 InventoryFolderBase result = m_Database.getInventoryFolder(folderId);
446 if (result != null) 446 if (result != null)
447 return result; 447 return result;
448 448
449 m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folder.ID); 449 m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folderId);
450 return null; 450 return null;
451 }
452
453 public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
454 {
455 return GetFolder(folder.ID, folder.Owner);
451 } 456 }
452 457
453 public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) 458 public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index af831fd..00aadc5 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -368,6 +368,11 @@ namespace OpenSim.Services.InventoryService
368 368
369 return ConvertToOpenSim(items[0]); 369 return ConvertToOpenSim(items[0]);
370 } 370 }
371
372 public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId)
373 {
374 return GetFolder(new InventoryFolderBase(folderId, userId));
375 }
371 376
372 public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) 377 public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
373 { 378 {