aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorJohn Hurliman2010-06-11 15:43:22 -0700
committerJohn Hurliman2010-06-11 15:43:22 -0700
commitb5bc2816fc43d1b5d2c54c90c8135eab7b0a72be (patch)
tree95db3efbd631a46c2006fc94dd5ed869ccfcc61a /OpenSim/Services
parent* Added a new method to IMapImageGenerator for getting the map tile before it... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.zip
opensim-SC-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.gz
opensim-SC-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.bz2
opensim-SC-b5bc2816fc43d1b5d2c54c90c8135eab7b0a72be.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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, 7 insertions, 40 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
index 5a23687..a7aa138 100644
--- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
@@ -171,11 +171,6 @@ 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 }
179 174
180 public InventoryFolderBase GetFolder(InventoryFolderBase folder) 175 public InventoryFolderBase GetFolder(InventoryFolderBase folder)
181 { 176 {
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
index e7acb59..e25e7eb 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
@@ -431,11 +431,6 @@ 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
439 public InventoryFolderBase GetFolder(InventoryFolderBase folder) 434 public InventoryFolderBase GetFolder(InventoryFolderBase folder)
440 { 435 {
441 try 436 try
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 6bf43d5..dc68259 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,11 +314,6 @@ 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 }
322 317
323 /// <summary> 318 /// <summary>
324 /// Get a folder, given by its UUID 319 /// Get a folder, given by its UUID
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index b0ffd8f..1b78fb3 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -170,14 +170,6 @@ 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>
181 /// Get a folder, given by its UUID 173 /// Get a folder, given by its UUID
182 /// </summary> 174 /// </summary>
183 /// <param name="folder"></param> 175 /// <param name="folder"></param>
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index 9f1c4a4..fbcd663 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -439,20 +439,15 @@ 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
443 public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId)
444 {
445 InventoryFolderBase result = m_Database.getInventoryFolder(folderId);
446 if (result != null)
447 return result;
448
449 m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folderId);
450 return null;
451 }
452 442
453 public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) 443 public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
454 { 444 {
455 return GetFolder(folder.ID, folder.Owner); 445 InventoryFolderBase result = m_Database.getInventoryFolder(folder.ID);
446 if (result != null)
447 return result;
448
449 m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folder.ID);
450 return null;
456 } 451 }
457 452
458 public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) 453 public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 00aadc5..af831fd 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -368,11 +368,6 @@ 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 }
376 371
377 public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder) 372 public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
378 { 373 {