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

3 files changed, 1 insertions, 16 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
         {
             return null;
         }
-        
-        public InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            return null; 
-        }
 
         public InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
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
             return null;
         }
 
-        public InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            return GetFolder(new InventoryFolderBase(folderId, userId));
-        }
-        
         public InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             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 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -314,11 +314,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found");
             return null;
         }
-        
-        public InventoryFolderBase GetFolder(UUID folderId, UUID userId) 
-        { 
-            return GetFolder(new InventoryFolderBase(folderId, userId));
-        }
 
         /// <summary>
         /// Get a folder, given by its UUID