OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
0.6.4-rc1
MW 2009-02-27 17:03:27 +00:00
parent bb9ba1602b
commit 5626d43259
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
View File

@ -44,7 +44,6 @@ using OpenSim.Region.Communications.Hypergrid;
using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.Local;
using OpenSim.Region.Communications.OGS1; using OpenSim.Region.Communications.OGS1;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.ApplicationPlugins.LoadRegions;
namespace OpenSim.ApplicationPlugins.CreateCommsManager namespace OpenSim.ApplicationPlugins.CreateCommsManager
{ {
@ -69,7 +68,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
protected GridInfoService m_gridInfoService; protected GridInfoService m_gridInfoService;
protected IHyperlink HGServices = null; protected IHyperlink HGServices = null;
protected LoadRegionsPlugin m_loadRegionsPlugin; protected IRegionCreator m_regionCreator;
public void Initialise() public void Initialise()
{ {
@ -91,9 +90,9 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
public void PostInitialise() 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;
} }
} }

2
OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
View File

@ -70,7 +70,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
public void Initialise(OpenSimBase openSim) public void Initialise(OpenSimBase openSim)
{ {
m_openSim = openSim; m_openSim = openSim;
m_openSim.ApplicationRegistry.RegisterInterface<LoadRegionsPlugin>(this); m_openSim.ApplicationRegistry.RegisterInterface<IRegionCreator>(this);
} }
public void PostInitialise() public void PostInitialise()

1
prebuild.xml
View File

@ -1464,7 +1464,6 @@
<Reference name="OpenSim.Region.Communications.Local"/> <Reference name="OpenSim.Region.Communications.Local"/>
<Reference name="OpenSim.Region.Communications.Hypergrid"/> <Reference name="OpenSim.Region.Communications.Hypergrid"/>
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.ApplicationPlugins.LoadRegions"/>
<Files> <Files>
<Match pattern="*.cs" recurse="true"/> <Match pattern="*.cs" recurse="true"/>