* Disabled IntergridModule until a Mono bug can be isolated.
parent
3bcb75acfe
commit
0880abc402
|
@ -39,11 +39,14 @@ namespace OpenSim.Region.Environment.Modules.Communications.Interregion
|
||||||
private Object m_lockObject = new object();
|
private Object m_lockObject = new object();
|
||||||
private TcpChannel m_tcpChannel;
|
private TcpChannel m_tcpChannel;
|
||||||
private int m_tcpPort = 10101;
|
private int m_tcpPort = 10101;
|
||||||
|
private bool m_enabled = false;
|
||||||
|
|
||||||
#region IRegionModule Members
|
#region IRegionModule Members
|
||||||
|
|
||||||
//TODO: This prevents us from registering new scenes after PostInitialise if we want comms updated.
|
//TODO: This prevents us from registering new scenes after PostInitialise if we want comms updated.
|
||||||
public void Initialise(Scene scene, IConfigSource source)
|
public void Initialise(Scene scene, IConfigSource source)
|
||||||
|
{
|
||||||
|
if (m_enabled)
|
||||||
{
|
{
|
||||||
m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX,
|
m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX,
|
||||||
(int) scene.RegionInfo.RegionLocY));
|
(int) scene.RegionInfo.RegionLocY));
|
||||||
|
@ -51,9 +54,12 @@ namespace OpenSim.Region.Environment.Modules.Communications.Interregion
|
||||||
|
|
||||||
scene.RegisterModuleInterface<IInterregionModule>(this);
|
scene.RegisterModuleInterface<IInterregionModule>(this);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//TODO: This prevents us from registering new scenes after PostInitialise if we want comms updated.
|
//TODO: This prevents us from registering new scenes after PostInitialise if we want comms updated.
|
||||||
public void PostInitialise()
|
public void PostInitialise()
|
||||||
|
{
|
||||||
|
if (m_enabled)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -65,6 +71,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.Interregion
|
||||||
|
|
||||||
internal_CreateRemotingObjects();
|
internal_CreateRemotingObjects();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void Close()
|
public void Close()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue