Changed the CreateCommsManagerPlugin so it requests a IRegionCreator and subscribes to the OnNewRegionCreated event on that interface rather than requesting the LoadRegionsPlugin directly.

Removed the reference to OpenSim.ApplicationPlugins.LoadRegions from the CreateCommsManagerPlugin project. 

3 files changed, 4 insertions, 6 deletions

diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index a5ad028..a1b3960 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -44,7 +44,6 @@ using OpenSim.Region.Communications.Hypergrid;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
 using OpenSim.Framework.Servers;
-using OpenSim.ApplicationPlugins.LoadRegions;
 
 namespace OpenSim.ApplicationPlugins.CreateCommsManager
 {
@@ -69,7 +68,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         protected GridInfoService m_gridInfoService;
         protected IHyperlink HGServices = null;
 
-        protected LoadRegionsPlugin m_loadRegionsPlugin;
+        protected IRegionCreator m_regionCreator;
 
         public void Initialise()
         {
@@ -91,9 +90,9 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 
         public void PostInitialise()
         {
-            if (m_openSim.ApplicationRegistry.TryGet<LoadRegionsPlugin>(out m_loadRegionsPlugin))
+            if (m_openSim.ApplicationRegistry.TryGet<IRegionCreator>(out m_regionCreator))
             {
-                m_loadRegionsPlugin.OnNewRegionCreated += RegionCreated;
+                m_regionCreator.OnNewRegionCreated += RegionCreated;
             }
         }
 
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 4a6a6b1..db89ea9 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -70,7 +70,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
         public void Initialise(OpenSimBase openSim)
         {
             m_openSim = openSim;
-            m_openSim.ApplicationRegistry.RegisterInterface<LoadRegionsPlugin>(this);
+            m_openSim.ApplicationRegistry.RegisterInterface<IRegionCreator>(this);
         }
 
         public void PostInitialise()
diff --git a/prebuild.xml b/prebuild.xml
index 4425520..0b42592 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1464,7 +1464,6 @@
       <Reference name="OpenSim.Region.Communications.Local"/>
       <Reference name="OpenSim.Region.Communications.Hypergrid"/>
       <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.ApplicationPlugins.LoadRegions"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>