Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 6 insertions, 11 deletions

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
             m_log.DebugFormat("[INVENTORY SERVICE]: GetItem failed to find item {0}", item.ID);
             return null;
         }
-        
-        public virtual InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            InventoryFolderBase result = m_Database.getInventoryFolder(folderId);
-            if (result != null)
-                return result;
-
-            m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folderId);
-            return null; 
-        }
 
         public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
-            return GetFolder(folder.ID, folder.Owner);
+            InventoryFolderBase result = m_Database.getInventoryFolder(folder.ID);
+            if (result != null)
+                return result;
+
+            m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folder.ID);
+            return null;
         }
 
         public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)