Merge branch 'master' into vehicles

2 files changed, 4 insertions, 6 deletions

diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs
index 2d28b8c..a6b0396 100644
--- a/OpenSim/Client/MXP/MXPModule.cs
+++ b/OpenSim/Client/MXP/MXPModule.cs
@@ -52,10 +52,10 @@ namespace OpenSim.Client.MXP
 
         private IConfigSource m_config;
         private int m_port = 1253;
+        private Timer m_ticker;
 
         private readonly Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
-        private readonly Timer m_ticker = new Timer(100);
-        private bool m_shutdown = false;
+        private bool m_shutdown;
 
         public void Initialise(Scene scene, IConfigSource source)
         {
@@ -78,6 +78,7 @@ namespace OpenSim.Client.MXP
 
                 m_server = new MXPPacketServer(m_port, m_scenes,m_config.Configs["StandAlone"].GetBoolean("accounts_authenticate",true));
 
+                m_ticker = new Timer(100);
                 m_ticker.AutoReset = false;
                 m_ticker.Elapsed += ticker_Elapsed;
 
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
index ba9c653..63381a4 100644
--- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
+++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
@@ -85,10 +85,7 @@ namespace OpenSim.Client.MXP.PacketHandler
 
             m_transmitter = new Transmitter(port);
 
-            m_clientThread = new Thread(StartListener);
-            m_clientThread.Name = "MXPThread";
-            m_clientThread.IsBackground = true;
-            m_clientThread.Start();
+            StartListener();
         }
 
         public void StartListener()