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

* Disabled IntergridModule until a Mono bug can be isolated.

0.6.0-stable
Adam Frisby 2008-04-29 19:10:15 +00:00
parent 3bcb75acfe
commit 0880abc402
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs
View File

@ -39,31 +39,38 @@ 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)
{ {
m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX, if (m_enabled)
(int) scene.RegionInfo.RegionLocY)); {
m_config = source; m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX,
(int) scene.RegionInfo.RegionLocY));
m_config = source;
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()
{ {
try if (m_enabled)
{ {
m_tcpPort = m_config.Configs["Comms"].GetInt("remoting_port", m_tcpPort); try
} {
catch m_tcpPort = m_config.Configs["Comms"].GetInt("remoting_port", m_tcpPort);
{ }
} catch
{
}
internal_CreateRemotingObjects(); internal_CreateRemotingObjects();
}
} }
public void Close() public void Close()