Merge branch 'master' into careminster-presence-refactor

The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.

1 files changed, 0 insertions, 11 deletions

diff --git a/OpenSim/Data/IInventoryData.cs b/OpenSim/Data/IInventoryData.cs
index 90f74b7..74d5d37 100644
--- a/OpenSim/Data/IInventoryData.cs
+++ b/OpenSim/Data/IInventoryData.cs
@@ -155,15 +155,4 @@ namespace OpenSim.Data
         /// </returns>
         List<InventoryItemBase> fetchActiveGestures(UUID avatarID);
     }
-
-    public class InventoryDataInitialiser : PluginInitialiserBase
-    {
-        private string connect;
-        public InventoryDataInitialiser (string s) { connect = s; }
-        public override void Initialise (IPlugin plugin)
-        {
-            IInventoryDataPlugin p = plugin as IInventoryDataPlugin;
-            p.Initialise (connect);
-        }
-    }
 }