From ee22569c9262277467df9a4b15674a1472fa0b71 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Aug 2011 02:19:13 +0100
Subject: only accept npc UUIDs to osNpc* functions, not names (except for
 create)

---
 OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index c745e5c..84d61f4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -483,14 +483,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osNpcCreate(user, name, position, cloneFrom);
         }
 
-        public key osNpcSaveAppearance(string avatar, string notecardName)
+        public key osNpcSaveAppearance(key npc, string notecardName)
         {
-            return m_OSSL_Functions.osNpcSaveAppearance(avatar, notecardName);
+            return m_OSSL_Functions.osNpcSaveAppearance(npc, notecardName);
         }
 
-        public void osNpcLoadAppearance(string avatar, string notecardNameOrUuid)
+        public void osNpcLoadAppearance(key npc, string notecardNameOrUuid)
         {
-            m_OSSL_Functions.osNpcLoadAppearance(avatar, notecardNameOrUuid);
+            m_OSSL_Functions.osNpcLoadAppearance(npc, notecardNameOrUuid);
         }
 
         public void osNpcMoveTo(key npc, vector position)
@@ -498,9 +498,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_OSSL_Functions.osNpcMoveTo(npc, position);
         }
 
-        public void osNpcMoveToTarget(key npc, vector position, int noFly)
+        public void osNpcMoveToTarget(key npc, vector position, int options)
         {
-            m_OSSL_Functions.osNpcMoveToTarget(npc, position, noFly);
+            m_OSSL_Functions.osNpcMoveToTarget(npc, position, options);
         }
 
         public void osNpcStopMoveTo(LSL_Key npc)
-- 
cgit v1.1