diff options
| author | Melanie | 2012-02-06 22:26:25 +0100 |
|---|---|---|
| committer | Melanie | 2012-02-06 22:26:25 +0100 |
| commit | a829f208280bcad82d5e1f5a66c53e4d586491e5 (patch) | |
| tree | 95d8c704e2787573acde0ed1cd4c9482b9dddb51 | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-a829f208280bcad82d5e1f5a66c53e4d586491e5.zip opensim-SC_OLD-a829f208280bcad82d5e1f5a66c53e4d586491e5.tar.gz opensim-SC_OLD-a829f208280bcad82d5e1f5a66c53e4d586491e5.tar.bz2 opensim-SC_OLD-a829f208280bcad82d5e1f5a66c53e4d586491e5.tar.xz | |
Experimental. Expand Fire & Forget for NPC delete
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 1f1d45e..614872e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2584,15 +2584,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2584 | CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); | 2584 | CheckThreatLevel(ThreatLevel.High, "osNpcRemove"); |
| 2585 | m_host.AddScriptLPS(1); | 2585 | m_host.AddScriptLPS(1); |
| 2586 | 2586 | ||
| 2587 | INPCModule module = World.RequestModuleInterface<INPCModule>(); | 2587 | Util.FireAndForget(delegate(object x) { |
| 2588 | if (module != null) | 2588 | INPCModule module = World.RequestModuleInterface<INPCModule>(); |
| 2589 | { | 2589 | if (module != null) |
| 2590 | UUID npcId = new UUID(npc.m_string); | 2590 | { |
| 2591 | UUID npcId = new UUID(npc.m_string); | ||
| 2591 | 2592 | ||
| 2592 | if (!module.CheckPermissions(npcId, m_host.OwnerID)) | 2593 | if (!module.CheckPermissions(npcId, m_host.OwnerID)) |
| 2593 | return; | 2594 | return; |
| 2594 | 2595 | ||
| 2595 | Util.FireAndForget(delegate(object x) { | ||
| 2596 | module.DeleteNPC(npcId, World); | 2596 | module.DeleteNPC(npcId, World); |
| 2597 | }); | 2597 | }); |
| 2598 | } | 2598 | } |