diff options
author | Melanie Thielker | 2017-01-07 00:29:20 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-07 00:29:20 +0000 |
commit | e81b3d8f0c2b3ed5ad4203e40935ae5fa6fa3eab (patch) | |
tree | a4c9e145bdbc10016c29c90c2c8224f7315358c8 /OpenSim | |
parent | Queue all events for a script that is waiting to compile (diff) | |
download | opensim-SC-e81b3d8f0c2b3ed5ad4203e40935ae5fa6fa3eab.zip opensim-SC-e81b3d8f0c2b3ed5ad4203e40935ae5fa6fa3eab.tar.gz opensim-SC-e81b3d8f0c2b3ed5ad4203e40935ae5fa6fa3eab.tar.bz2 opensim-SC-e81b3d8f0c2b3ed5ad4203e40935ae5fa6fa3eab.tar.xz |
Remove a red ink error on shutdown. Harmless message since shutting down anyway
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | 8 |
1 files changed, 7 insertions, 1 deletions
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 | |||
186 | m_log.DebugFormat("[GetMeshModule] Closing"); | 186 | m_log.DebugFormat("[GetMeshModule] Closing"); |
187 | foreach (Thread t in m_workerThreads) | 187 | foreach (Thread t in m_workerThreads) |
188 | Watchdog.AbortThread(t.ManagedThreadId); | 188 | Watchdog.AbortThread(t.ManagedThreadId); |
189 | m_queue.Clear(); | 189 | // This will fail on region shutdown. Its harmless. |
190 | // Prevent red ink. | ||
191 | try | ||
192 | { | ||
193 | m_queue.Clear(); | ||
194 | } | ||
195 | catch {} | ||
190 | } | 196 | } |
191 | } | 197 | } |
192 | 198 | ||