aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-06-14 23:53:20 +0100
committerJustin Clark-Casey (justincc)2013-06-14 23:53:20 +0100
commitd412c1b0eb002b9ad5e6fc7aa1e01ea8f3725618 (patch)
treee559ba5dc13c0538f1361b7b28b7e6b28b3eb318 /OpenSim/Region
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-d412c1b0eb002b9ad5e6fc7aa1e01ea8f3725618.zip
opensim-SC_OLD-d412c1b0eb002b9ad5e6fc7aa1e01ea8f3725618.tar.gz
opensim-SC_OLD-d412c1b0eb002b9ad5e6fc7aa1e01ea8f3725618.tar.bz2
opensim-SC_OLD-d412c1b0eb002b9ad5e6fc7aa1e01ea8f3725618.tar.xz
Don't try to abort worker threads in WebFetchInvDescModule if module was not enabled.
This also moves the abort to RemoveRegion() rather than a destructor.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs10
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index d1afff2..2024018 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -116,6 +116,10 @@ namespace OpenSim.Region.ClientStack.Linden
116 116
117 m_scene.EventManager.OnRegisterCaps -= RegisterCaps; 117 m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
118 m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps; 118 m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps;
119
120 foreach (Thread t in m_workerThreads)
121 Watchdog.AbortThread(t.ManagedThreadId);
122
119 m_scene = null; 123 m_scene = null;
120 } 124 }
121 125
@@ -165,12 +169,6 @@ namespace OpenSim.Region.ClientStack.Linden
165 169
166 #endregion 170 #endregion
167 171
168 ~WebFetchInvDescModule()
169 {
170 foreach (Thread t in m_workerThreads)
171 Watchdog.AbortThread(t.ManagedThreadId);
172 }
173
174 private class PollServiceInventoryEventArgs : PollServiceEventArgs 172 private class PollServiceInventoryEventArgs : PollServiceEventArgs
175 { 173 {
176 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 174 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);