Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

1 files changed, 11 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index b19f8cf..bfe62c7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2359,6 +2359,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
+        public void osNpcSit(LSL_Key npc, LSL_Key target, int options)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcSit");
+
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                module.Sit(new UUID(npc.m_string), new UUID(target.m_string), World);
+            }
+        }
+
         public void osNpcRemove(LSL_Key npc)
         {
             CheckThreatLevel(ThreatLevel.High, "osNpcRemove");