aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorAdam Frisby2008-04-29 19:10:15 +0000
committerAdam Frisby2008-04-29 19:10:15 +0000
commit0880abc402b0f94c7661bbf646a4afa3faaeccce (patch)
treed700da237f02232642f41836de6e3a8b9aea26f7 /OpenSim/Region
parent* One more attempted fix. (diff)
downloadopensim-SC_OLD-0880abc402b0f94c7661bbf646a4afa3faaeccce.zip
opensim-SC_OLD-0880abc402b0f94c7661bbf646a4afa3faaeccce.tar.gz
opensim-SC_OLD-0880abc402b0f94c7661bbf646a4afa3faaeccce.tar.bz2
opensim-SC_OLD-0880abc402b0f94c7661bbf646a4afa3faaeccce.tar.xz
* Disabled IntergridModule until a Mono bug can be isolated.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs29
1 files changed, 18 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs b/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs
index b76a754..8d040c4 100644
--- a/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs
@@ -39,31 +39,38 @@ namespace OpenSim.Region.Environment.Modules.Communications.Interregion
39 private Object m_lockObject = new object(); 39 private Object m_lockObject = new object();
40 private TcpChannel m_tcpChannel; 40 private TcpChannel m_tcpChannel;
41 private int m_tcpPort = 10101; 41 private int m_tcpPort = 10101;
42 private bool m_enabled = false;
42 43
43 #region IRegionModule Members 44 #region IRegionModule Members
44 45
45 //TODO: This prevents us from registering new scenes after PostInitialise if we want comms updated. 46 //TODO: This prevents us from registering new scenes after PostInitialise if we want comms updated.
46 public void Initialise(Scene scene, IConfigSource source) 47 public void Initialise(Scene scene, IConfigSource source)
47 { 48 {
48 m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX, 49 if (m_enabled)
49 (int) scene.RegionInfo.RegionLocY)); 50 {
50 m_config = source; 51 m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX,
52 (int) scene.RegionInfo.RegionLocY));
53 m_config = source;
51 54
52 scene.RegisterModuleInterface<IInterregionModule>(this); 55 scene.RegisterModuleInterface<IInterregionModule>(this);
56 }
53 } 57 }
54 58
55 //TODO: This prevents us from registering new scenes after PostInitialise if we want comms updated. 59 //TODO: This prevents us from registering new scenes after PostInitialise if we want comms updated.
56 public void PostInitialise() 60 public void PostInitialise()
57 { 61 {
58 try 62 if (m_enabled)
59 {
60 m_tcpPort = m_config.Configs["Comms"].GetInt("remoting_port", m_tcpPort);
61 }
62 catch
63 { 63 {
64 } 64 try
65 {
66 m_tcpPort = m_config.Configs["Comms"].GetInt("remoting_port", m_tcpPort);
67 }
68 catch
69 {
70 }
65 71
66 internal_CreateRemotingObjects(); 72 internal_CreateRemotingObjects();
73 }
67 } 74 }
68 75
69 public void Close() 76 public void Close()