diff options
author | Adam Frisby | 2008-04-29 18:52:19 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-29 18:52:19 +0000 |
commit | 3bcb75acfe31c09512c61968a8d10aa99b3030a3 (patch) | |
tree | c8c8185369efecfd84cce3ffa7b8b8d729a6744e /OpenSim | |
parent | * Made a change to InterGrid module to prevent duplicate registrations. (diff) | |
download | opensim-SC_OLD-3bcb75acfe31c09512c61968a8d10aa99b3030a3.zip opensim-SC_OLD-3bcb75acfe31c09512c61968a8d10aa99b3030a3.tar.gz opensim-SC_OLD-3bcb75acfe31c09512c61968a8d10aa99b3030a3.tar.bz2 opensim-SC_OLD-3bcb75acfe31c09512c61968a8d10aa99b3030a3.tar.xz |
* One more attempted fix.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs b/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs index 685aed9..b76a754 100644 --- a/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs +++ b/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs | |||
@@ -36,6 +36,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.Interregion | |||
36 | private IConfigSource m_config; | 36 | private IConfigSource m_config; |
37 | private RemotingObject m_myRemote; | 37 | private RemotingObject m_myRemote; |
38 | 38 | ||
39 | private Object m_lockObject = new object(); | ||
39 | private TcpChannel m_tcpChannel; | 40 | private TcpChannel m_tcpChannel; |
40 | private int m_tcpPort = 10101; | 41 | private int m_tcpPort = 10101; |
41 | 42 | ||
@@ -84,7 +85,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.Interregion | |||
84 | 85 | ||
85 | public void internal_CreateRemotingObjects() | 86 | public void internal_CreateRemotingObjects() |
86 | { | 87 | { |
87 | lock (m_tcpChannel) | 88 | lock (m_lockObject) |
88 | { | 89 | { |
89 | if (m_tcpChannel == null) | 90 | if (m_tcpChannel == null) |
90 | { | 91 | { |