diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-09 16:20:19 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-09 16:20:19 -0400 |
| commit | c605509da3a690d4050c48418111d7f29f7be9b4 (patch) | |
| tree | e2e76c5e521577c9be9002530d289a4b346f2907 /OpenSim/Grid | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC-c605509da3a690d4050c48418111d7f29f7be9b4.zip opensim-SC-c605509da3a690d4050c48418111d7f29f7be9b4.tar.gz opensim-SC-c605509da3a690d4050c48418111d7f29f7be9b4.tar.bz2 opensim-SC-c605509da3a690d4050c48418111d7f29f7be9b4.tar.xz | |
* Lock timers when Calling Start() and Stop() when the Thread Context is murky. This affects Mono only.
Diffstat (limited to 'OpenSim/Grid')
| -rw-r--r-- | OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs | 3 |
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() |