diff options
author | Adam Frisby | 2008-05-01 18:04:42 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 18:04:42 +0000 |
commit | 20a9bf08f51351e1e0a9de94f184ff56cd572665 (patch) | |
tree | 52da64dab26353b903c8e4befed0178fa72a188b /OpenSim/Region/Environment/Modules/Grid | |
parent | More config cleanup in LaunchSLClient. (diff) | |
download | opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.zip opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.gz opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.bz2 opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.xz |
* Rolled back a few changes.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Grid')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs index ac2ac0b..2ca4df9 100644 --- a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs +++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs | |||
@@ -29,14 +29,14 @@ namespace OpenSim.Region.Environment.Modules.Grid.Interregion | |||
29 | #endregion | 29 | #endregion |
30 | 30 | ||
31 | private readonly Dictionary<Type, Object> m_interfaces = new Dictionary<Type, object>(); | 31 | private readonly Dictionary<Type, Object> m_interfaces = new Dictionary<Type, object>(); |
32 | private readonly Object m_lockObject = new object(); | ||
33 | private readonly List<Location> m_myLocations = new List<Location>(); | 32 | private readonly List<Location> m_myLocations = new List<Location>(); |
34 | 33 | ||
35 | private readonly Dictionary<Location, string[]> m_neighbourInterfaces = new Dictionary<Location, string[]>(); | 34 | private readonly Dictionary<Location, string[]> m_neighbourInterfaces = new Dictionary<Location, string[]>(); |
36 | private readonly Dictionary<Location, RemotingObject> m_neighbourRemote = new Dictionary<Location, RemotingObject>(); | 35 | private readonly Dictionary<Location, RemotingObject> m_neighbourRemote = new Dictionary<Location, RemotingObject>(); |
37 | private IConfigSource m_config; | 36 | private IConfigSource m_config; |
38 | private bool m_enabled; | 37 | private bool m_enabled = false; |
39 | 38 | ||
39 | private Object m_lockObject = new object(); | ||
40 | private RemotingObject m_myRemote; | 40 | private RemotingObject m_myRemote; |
41 | private TcpChannel m_tcpChannel; | 41 | private TcpChannel m_tcpChannel; |
42 | private int m_tcpPort = 10101; | 42 | private int m_tcpPort = 10101; |