aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/MXP/MXPModule.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Client/MXP/MXPModule.cs11
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