aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2009-02-27 17:03:27 +0000
committerMW2009-02-27 17:03:27 +0000
commit5626d43259abfb0cac36d813f8d0090d28a47bb0 (patch)
tree19740017ad0f656812946caa0bd966804a7d7dbe
parentChanged the order of the OpenSim.Grid.GridServer and OpenSim.Grid.GridServer.... (diff)
downloadopensim-SC_OLD-5626d43259abfb0cac36d813f8d0090d28a47bb0.zip
opensim-SC_OLD-5626d43259abfb0cac36d813f8d0090d28a47bb0.tar.gz
opensim-SC_OLD-5626d43259abfb0cac36d813f8d0090d28a47bb0.tar.bz2
opensim-SC_OLD-5626d43259abfb0cac36d813f8d0090d28a47bb0.tar.xz
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.
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs7
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs2
-rw-r--r--prebuild.xml1
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;
44using OpenSim.Region.Communications.Local; 44using OpenSim.Region.Communications.Local;
45using OpenSim.Region.Communications.OGS1; 45using OpenSim.Region.Communications.OGS1;
46using OpenSim.Framework.Servers; 46using OpenSim.Framework.Servers;
47using OpenSim.ApplicationPlugins.LoadRegions;
48 47
49namespace OpenSim.ApplicationPlugins.CreateCommsManager 48namespace OpenSim.ApplicationPlugins.CreateCommsManager
50{ 49{
@@ -69,7 +68,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
69 protected GridInfoService m_gridInfoService; 68 protected GridInfoService m_gridInfoService;
70 protected IHyperlink HGServices = null; 69 protected IHyperlink HGServices = null;
71 70
72 protected LoadRegionsPlugin m_loadRegionsPlugin; 71 protected IRegionCreator m_regionCreator;
73 72
74 public void Initialise() 73 public void Initialise()
75 { 74 {
@@ -91,9 +90,9 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
91 90
92 public void PostInitialise() 91 public void PostInitialise()
93 { 92 {
94 if (m_openSim.ApplicationRegistry.TryGet<LoadRegionsPlugin>(out m_loadRegionsPlugin)) 93 if (m_openSim.ApplicationRegistry.TryGet<IRegionCreator>(out m_regionCreator))
95 { 94 {
96 m_loadRegionsPlugin.OnNewRegionCreated += RegionCreated; 95 m_regionCreator.OnNewRegionCreated += RegionCreated;
97 } 96 }
98 } 97 }
99 98
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
70 public void Initialise(OpenSimBase openSim) 70 public void Initialise(OpenSimBase openSim)
71 { 71 {
72 m_openSim = openSim; 72 m_openSim = openSim;
73 m_openSim.ApplicationRegistry.RegisterInterface<LoadRegionsPlugin>(this); 73 m_openSim.ApplicationRegistry.RegisterInterface<IRegionCreator>(this);
74 } 74 }
75 75
76 public void PostInitialise() 76 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 @@
1464 <Reference name="OpenSim.Region.Communications.Local"/> 1464 <Reference name="OpenSim.Region.Communications.Local"/>
1465 <Reference name="OpenSim.Region.Communications.Hypergrid"/> 1465 <Reference name="OpenSim.Region.Communications.Hypergrid"/>
1466 <Reference name="OpenSim.Framework.Communications"/> 1466 <Reference name="OpenSim.Framework.Communications"/>
1467 <Reference name="OpenSim.ApplicationPlugins.LoadRegions"/>
1468 1467
1469 <Files> 1468 <Files>
1470 <Match pattern="*.cs" recurse="true"/> 1469 <Match pattern="*.cs" recurse="true"/>