aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
diff options
context:
space:
mode:
authorMelanie2013-06-18 01:50:08 +0100
committerMelanie2013-06-18 01:50:08 +0100
commit56f4adeb60622aaec687f3a6699a03c964f59d5b (patch)
tree0ba2fe5ffd3984b41fab05b56361fda507b2a34a /OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
parentMerge branch 'master' into careminster (diff)
parentcorrect method doc for llRot2Axis() (diff)
downloadopensim-SC-56f4adeb60622aaec687f3a6699a03c964f59d5b.zip
opensim-SC-56f4adeb60622aaec687f3a6699a03c964f59d5b.tar.gz
opensim-SC-56f4adeb60622aaec687f3a6699a03c964f59d5b.tar.bz2
opensim-SC-56f4adeb60622aaec687f3a6699a03c964f59d5b.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs')
-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 6fb6497..bba8ff1 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);