From 9c6ba8d18f4b3c4b457240f251612691cb271d90 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 8 Feb 2012 13:04:23 +0100 Subject: Push more NPC stuff into threads --- .../Shared/Api/Implementation/OSSL_Api.cs | 26 +++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 614872e..c83df4e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -2584,18 +2584,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); m_host.AddScriptLPS(1); + ManualResetEvent ev = new ManualResetEvent(false); + Util.FireAndForget(delegate(object x) { - INPCModule module = World.RequestModuleInterface(); - if (module != null) + try { - UUID npcId = new UUID(npc.m_string); + INPCModule module = World.RequestModuleInterface(); + if (module != null) + { + UUID npcId = new UUID(npc.m_string); - if (!module.CheckPermissions(npcId, m_host.OwnerID)) - return; + if (!module.CheckPermissions(npcId, m_host.OwnerID)) + return; - module.DeleteNPC(npcId, World); - }); - } + module.DeleteNPC(npcId, World); + } + } + finally + { + ev.Set(); + } + }); + ev.WaitOne(); } public void osNpcPlayAnimation(LSL_Key npc, string animation) -- cgit v1.1