diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 7 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 2 |
2 files changed, 4 insertions, 5 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; | |||
44 | using OpenSim.Region.Communications.Local; | 44 | using OpenSim.Region.Communications.Local; |
45 | using OpenSim.Region.Communications.OGS1; | 45 | using OpenSim.Region.Communications.OGS1; |
46 | using OpenSim.Framework.Servers; | 46 | using OpenSim.Framework.Servers; |
47 | using OpenSim.ApplicationPlugins.LoadRegions; | ||
48 | 47 | ||
49 | namespace OpenSim.ApplicationPlugins.CreateCommsManager | 48 | namespace 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() |