diff options
author | Justin Clark-Casey (justincc) | 2009-09-10 18:14:34 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-10 18:14:34 +0100 |
commit | 552ba5334f9d44001768400e3d4315e0f4fa5a28 (patch) | |
tree | c47d38287011840fb08e5ecbdb879952e3420312 /OpenSim/Client/MXP | |
parent | refactor: Replace some iar item name generation in tests with helper function (diff) | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC-552ba5334f9d44001768400e3d4315e0f4fa5a28.zip opensim-SC-552ba5334f9d44001768400e3d4315e0f4fa5a28.tar.gz opensim-SC-552ba5334f9d44001768400e3d4315e0f4fa5a28.tar.bz2 opensim-SC-552ba5334f9d44001768400e3d4315e0f4fa5a28.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Client/MXP')
-rw-r--r-- | OpenSim/Client/MXP/MXPModule.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs index dbe4174..2d28b8c 100644 --- a/OpenSim/Client/MXP/MXPModule.cs +++ b/OpenSim/Client/MXP/MXPModule.cs | |||
@@ -81,7 +81,8 @@ namespace OpenSim.Client.MXP | |||
81 | m_ticker.AutoReset = false; | 81 | m_ticker.AutoReset = false; |
82 | m_ticker.Elapsed += ticker_Elapsed; | 82 | m_ticker.Elapsed += ticker_Elapsed; |
83 | 83 | ||
84 | m_ticker.Start(); | 84 | lock (m_ticker) |
85 | m_ticker.Start(); | ||
85 | 86 | ||
86 | m_log.Info("[MXP ClientStack] MXP Enabled and Listening"); | 87 | m_log.Info("[MXP ClientStack] MXP Enabled and Listening"); |
87 | } | 88 | } |
@@ -99,13 +100,17 @@ namespace OpenSim.Client.MXP | |||
99 | } | 100 | } |
100 | 101 | ||
101 | if (!m_shutdown) | 102 | if (!m_shutdown) |
102 | m_ticker.Start(); | 103 | { |
104 | lock (m_ticker) | ||
105 | m_ticker.Start(); | ||
106 | } | ||
103 | } | 107 | } |
104 | 108 | ||
105 | public void Close() | 109 | public void Close() |
106 | { | 110 | { |
107 | m_shutdown = true; | 111 | m_shutdown = true; |
108 | m_ticker.Stop(); | 112 | lock (m_ticker) |
113 | m_ticker.Stop(); | ||
109 | } | 114 | } |
110 | 115 | ||
111 | public string Name | 116 | public string Name |