From 679d155a397567765d142e793a68679957866a6f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 6 Jan 2012 22:33:51 +0100
Subject: Fix some syntax issues

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 ++--
 OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index efb77ae..b3477ac 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2350,7 +2350,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (module != null)
             {
                 UUID npcID = new UUID(npc.m_string);
-                if (module.IsNPC(npcID))
+                if (module.IsNPC(npcID, m_host.ParentGroup.Scene))
                 {
                     UUID ownerID = module.GetOwner(npcID);
                     if (ownerID == UUID.Zero || ownerID == m_host.OwnerID)
@@ -2367,7 +2367,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (module != null)
             {
                 UUID npcID = new UUID(npc.m_string);
-                if (module.IsNPC(npcID))
+                if (module.IsNPC(npcID, m_host.ParentGroup.Scene))
                 {
                     UUID ownerID = module.GetOwner(npcID);
                     if (ownerID == UUID.Zero || ownerID == m_host.OwnerID)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index d5e085d..f92f51f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -185,8 +185,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void osNpcSit(key npc, key target, int options);
         void osNpcStand(LSL_Key npc);
         void osNpcRemove(key npc);
-        public void osNpcPlayAnimation(LSL_Key npc, string animation);
-        public void osNpcStopAnimation(LSL_Key npc, string animation);
+        void osNpcPlayAnimation(LSL_Key npc, string animation);
+        void osNpcStopAnimation(LSL_Key npc, string animation);
 
         LSL_Key osOwnerSaveAppearance(string notecard);
         LSL_Key osAgentSaveAppearance(key agentId, string notecard);
-- 
cgit v1.1