From 8a6442173589a0e267dbacb50f8d22c6b57280c1 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 30 Oct 2009 18:08:58 +0000
Subject: Squelch an error message on sim shutdown when not using MXP

---
 OpenSim/Client/MXP/MXPModule.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs
index a6b0396..0b442cc 100644
--- a/OpenSim/Client/MXP/MXPModule.cs
+++ b/OpenSim/Client/MXP/MXPModule.cs
@@ -110,8 +110,11 @@ namespace OpenSim.Client.MXP
         public void Close()
         {
             m_shutdown = true;
-            lock (m_ticker)
-                m_ticker.Stop();
+            if (m_ticker != null)
+            {
+                lock (m_ticker)
+                    m_ticker.Stop();
+            }
         }
 
         public string Name
-- 
cgit v1.1