Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

OpenSim/Client/MXP/MXPModule.cs

@@ -110,8 +110,11 @@ namespace OpenSim.Client.MXP
         public void Close()
         {
             m_shutdown = true;
-            lock (m_ticker)
+            if (m_ticker != null)
-                m_ticker.Stop();
+            {
+                lock (m_ticker)
+                    m_ticker.Stop();
+            }
         }
 
         public string Name