aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-01-17 11:18:56 +0100
committerMelanie2012-01-17 11:18:56 +0100
commit747c25e92083c6a71b4163a9336c91cffa67bfb2 (patch)
tree4f0b101239ef006f6656d58b272c02bf3f95d72c
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-747c25e92083c6a71b4163a9336c91cffa67bfb2.zip
opensim-SC-747c25e92083c6a71b4163a9336c91cffa67bfb2.tar.gz
opensim-SC-747c25e92083c6a71b4163a9336c91cffa67bfb2.tar.bz2
opensim-SC-747c25e92083c6a71b4163a9336c91cffa67bfb2.tar.xz
Spin off NPC deletion into a thread to avoid it being done on a script
microthread. A stab at fixing exceptions.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index ca340c6..37792ef 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2406,7 +2406,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2406 if (!module.CheckPermissions(npcId, m_host.OwnerID)) 2406 if (!module.CheckPermissions(npcId, m_host.OwnerID))
2407 return; 2407 return;
2408 2408
2409 module.DeleteNPC(npcId, World); 2409 Util.FireAndForget(delegate(object x) {
2410 module.DeleteNPC(npcId, World);
2411 });
2410 } 2412 }
2411 } 2413 }
2412 2414