From e81b3d8f0c2b3ed5ad4203e40935ae5fa6fa3eab Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 7 Jan 2017 00:29:20 +0000
Subject: Remove a red ink error on shutdown. Harmless message since shutting
 down anyway

---
 OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index ae18bc1..69ff713 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -186,7 +186,13 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_log.DebugFormat("[GetMeshModule] Closing");
                 foreach (Thread t in m_workerThreads)
                     Watchdog.AbortThread(t.ManagedThreadId);
-                m_queue.Clear();
+                // This will fail on region shutdown. Its harmless.
+                // Prevent red ink.
+                try
+                {
+                    m_queue.Clear();
+                }
+                catch {}
             }
         }
 
-- 
cgit v1.1