aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-09-10 18:14:34 +0100
committerJustin Clark-Casey (justincc)2009-09-10 18:14:34 +0100
commit552ba5334f9d44001768400e3d4315e0f4fa5a28 (patch)
treec47d38287011840fb08e5ecbdb879952e3420312 /OpenSim/Grid
parentrefactor: Replace some iar item name generation in tests with helper function (diff)
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-552ba5334f9d44001768400e3d4315e0f4fa5a28.zip
opensim-SC_OLD-552ba5334f9d44001768400e3d4315e0f4fa5a28.tar.gz
opensim-SC_OLD-552ba5334f9d44001768400e3d4315e0f4fa5a28.tar.bz2
opensim-SC_OLD-552ba5334f9d44001768400e3d4315e0f4fa5a28.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs b/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
index 0eb7b6a..ae04535 100644
--- a/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
@@ -58,7 +58,8 @@ namespace OpenSim.Grid.MessagingServer.Modules
58 m_messageCore = messageCore; 58 m_messageCore = messageCore;
59 59
60 reconnectTimer.Elapsed += registerWithUserServer; 60 reconnectTimer.Elapsed += registerWithUserServer;
61 reconnectTimer.Start(); 61 lock (reconnectTimer)
62 reconnectTimer.Start();
62 } 63 }
63 64
64 public void Initialise() 65 public void Initialise()