Merge branch 'master' into httptests

2026-08-01 14:16:07 +08:00 · 2017-01-07 16:55:03 +00:00
parent 6172446e2a ed526916b7
commit add27a503e
23 changed files with 485 additions and 363 deletions
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -185,7 +185,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 {}
            }
        }