5 files changed, 182 insertions, 8 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 2dbbf70..16dd834 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1978,6 +1978,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
         }
 
+        private LSL_Rotation GetPartRot(SceneObjectPart part)
+        {
+            Quaternion q;
+            if (part.LinkNum == 0 || part.LinkNum == 1) // unlinked or root prim
+            {
+                if (part.ParentGroup.RootPart.AttachmentPoint != 0)
+                {
+                    ScenePresence avatar = World.GetScenePresence(part.AttachedAvatar);
+                    if (avatar != null)
+                    {
+                        if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
+                            q = avatar.CameraRotation; // Mouselook
+                        else
+                            q = avatar.Rotation; // Currently infrequently updated so may be inaccurate
+                    }
+                    else
+                        q = part.ParentGroup.GroupRotation; // Likely never get here but just in case
+                }
+                else
+                    q = part.ParentGroup.GroupRotation; // just the group rotation
+                return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
+            }
+            q = part.GetWorldRotation();
+            return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
+        }
+
         public LSL_Rotation llGetLocalRot()
         {
             m_host.AddScriptLPS(1);
@@ -7299,7 +7325,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         break;
 
                     case (int)ScriptBaseClass.PRIM_ROTATION:
-                        res.Add(llGetRot());
+                        res.Add(GetPartRot(part));
                         break;
 
                     case (int)ScriptBaseClass.PRIM_TYPE:
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 6e3a3ab..b1c357c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -31,12 +31,14 @@ using System.Collections.Generic;
 using System.Runtime.Remoting.Lifetime;
 using System.Text;
 using System.Net;
+using System.Threading;
 using OpenMetaverse;
 using Nini.Config;
 using OpenSim;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
+using OpenSim.Region.CoreModules.Avatar.NPC;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Hypergrid;
@@ -831,6 +833,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return drawList;
         }
 
+        public string osDrawFilledPolygon(string drawList, LSL_List x, LSL_List y)
+        {
+            CheckThreatLevel(ThreatLevel.None, "osDrawFilledPolygon");
+
+            m_host.AddScriptLPS(1);
+
+            if (x.Length != y.Length || x.Length < 3)
+            {
+                return "";
+            }
+            drawList += "FillPolygon " + x.GetLSLStringItem(0) + "," + y.GetLSLStringItem(0);
+            for (int i = 1; i < x.Length; i++)
+            {
+                drawList += "," + x.GetLSLStringItem(i) + "," + y.GetLSLStringItem(i);
+            }
+            drawList += "; ";
+            return drawList;
+        }
+
         public string osSetFontSize(string drawList, int fontSize)
         {
             CheckThreatLevel(ThreatLevel.None, "osSetFontSize");
@@ -858,6 +879,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return drawList;
         }
 
+        public string osSetPenCap(string drawList, string direction, string type)
+        {
+            CheckThreatLevel(ThreatLevel.None, "osSetPenColour");
+
+            m_host.AddScriptLPS(1);
+            drawList += "PenCap " + direction + "," + type + "; ";
+            return drawList;
+        }
+
         public string osDrawImage(string drawList, int width, int height, string imageUrl)
         {
             CheckThreatLevel(ThreatLevel.None, "osDrawImage");
@@ -1762,5 +1792,57 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return retVal;
         }
 
+        public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, LSL_Key cloneFrom)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
+            //QueueUserWorkItem 
+
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                UUID x = module.CreateNPC(firstname,
+                                          lastname,
+                                          new Vector3((float) position.x, (float) position.y, (float) position.z),
+                                          World,
+                                          new UUID(cloneFrom));
+
+                return new LSL_Key(x.ToString());
+            }
+            return new LSL_Key(UUID.Zero.ToString());
+        }
+
+        public void osNpcMoveTo(LSL_Key npc, LSL_Vector position)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcMoveTo");
+
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z);
+                module.Autopilot(new UUID(npc.m_string), World, pos);
+            }
+        }
+
+        public void osNpcSay(LSL_Key npc, string message)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcSay");
+
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                module.Say(new UUID(npc.m_string), World, message);
+            }
+        }
+
+        public void osNpcRemove(LSL_Key npc)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcRemove");
+
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                module.DeleteNPC(new UUID(npc.m_string), World);
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 0be29f2..2365bee 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -97,9 +97,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         string osDrawEllipse(string drawList, int width, int height);
         string osDrawRectangle(string drawList, int width, int height);
         string osDrawFilledRectangle(string drawList, int width, int height);
+        string osDrawFilledPolygon(string drawList, LSL_List x, LSL_List y);
         string osSetFontSize(string drawList, int fontSize);
         string osSetPenSize(string drawList, int penSize);
         string osSetPenColour(string drawList, string colour);
+        string osSetPenCap(string drawList, string direction, string type);
         string osDrawImage(string drawList, int width, int height, string imageUrl);
         vector osGetDrawStringSize(string contentType, string text, string fontName, int fontSize);
         void osSetStateEvents(int events);
@@ -149,5 +151,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         
         LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules);
 
+
+        key osNpcCreate(string user, string name, vector position, key cloneFrom);
+        void osNpcMoveTo(key npc, vector position);
+        void osNpcSay(key npc, string message);
+        void osNpcRemove(key npc);
+
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index abdba05..f877acb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -267,6 +267,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osDrawFilledRectangle(drawList, width, height);
         }
 
+        public string osDrawFilledPolygon(string drawList, LSL_List x, LSL_List y)
+        {
+            return m_OSSL_Functions.osDrawFilledPolygon(drawList, x, y);
+        }
+
         public string osSetFontSize(string drawList, int fontSize)
         {
             return m_OSSL_Functions.osSetFontSize(drawList, fontSize);
@@ -277,6 +282,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osSetPenSize(drawList, penSize);
         }
 
+        public string osSetPenCap(string drawList, string direction, string type)
+        {
+            return m_OSSL_Functions.osSetPenCap(drawList, direction, type);
+        }
+
         public string osSetPenColour(string drawList, string colour)
         {
             return m_OSSL_Functions.osSetPenColour(drawList, colour);
@@ -393,6 +403,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osGetLinkPrimitiveParams(linknumber, rules);
         }
 
+        public key osNpcCreate(string user, string name, vector position, key cloneFrom)
+        {
+            return m_OSSL_Functions.osNpcCreate(user, name, position, cloneFrom);
+        }
+
+        public void osNpcMoveTo(key npc, vector position)
+        {
+            m_OSSL_Functions.osNpcMoveTo(npc, position);
+        }
+
+        public void osNpcSay(key npc, string message)
+        {
+            m_OSSL_Functions.osNpcSay(npc, message);
+        }
+
+        public void osNpcRemove(key npc)
+        {
+            m_OSSL_Functions.osNpcRemove(npc);
+        }
 
         public OSSLPrim Prim;
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index bdacf8b..2842f6b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -439,6 +439,13 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
                 set {m_data = value; }
             }
+        // Function to obtain LSL type from an index. This is needed
+        // because LSL lists allow for multiple types, and safely
+        // iterating in them requires a type check.
+            public Type GetLSLListItemType(int itemIndex)
+            {
+                return m_data[itemIndex].GetType();
+            }
 
         // Member functions to obtain item as specific types.
         // For cases where implicit conversions would apply if items
@@ -465,6 +472,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
                 {
                     return new LSL_Types.LSLFloat((Double)m_data[itemIndex]);
                 }
+                else if (m_data[itemIndex] is LSL_Types.LSLString)
+                {
+                    return new LSL_Types.LSLFloat(m_data[itemIndex].ToString());
+                }
                 else
                 {
                     return (LSL_Types.LSLFloat)m_data[itemIndex];
@@ -481,20 +492,32 @@ namespace OpenSim.Region.ScriptEngine.Shared
               {
                 return new LSL_Types.LSLString((string)m_data[itemIndex]);
               }
+              else if (m_data[itemIndex] is LSL_Types.LSLFloat)
+              {
+                  return new LSL_Types.LSLString((LSLFloat)m_data[itemIndex]);
+              }
+              else if (m_data[itemIndex] is LSL_Types.LSLInteger)
+              {
+                  return new LSL_Types.LSLString((LSLInteger)m_data[itemIndex]);
+              }
               else
               {
-                return (LSL_Types.LSLString)m_data[itemIndex];
+                  return (LSL_Types.LSLString)m_data[itemIndex];
               }
             }
 
             public LSL_Types.LSLInteger GetLSLIntegerItem(int itemIndex)
             {
-              if (m_data[itemIndex] is LSL_Types.LSLInteger)
-                  return (LSL_Types.LSLInteger)m_data[itemIndex];
-              else if (m_data[itemIndex] is Int32)
-                  return new LSLInteger((int)m_data[itemIndex]);
-              else
-                  throw new InvalidCastException();
+                if (m_data[itemIndex] is LSL_Types.LSLInteger)
+                    return (LSL_Types.LSLInteger)m_data[itemIndex];
+                if (m_data[itemIndex] is LSL_Types.LSLFloat)
+                    return new LSLInteger((int)m_data[itemIndex]);
+                else if (m_data[itemIndex] is Int32)
+                    return new LSLInteger((int)m_data[itemIndex]);
+                else if (m_data[itemIndex] is LSL_Types.LSLString)
+                    return new LSLInteger((string)m_data[itemIndex]);
+                else
+                    throw new InvalidCastException();
             }
 
             public LSL_Types.Vector3 GetVector3Item(int itemIndex)
@@ -1331,6 +1354,12 @@ namespace OpenSim.Region.ScriptEngine.Shared
                 m_string=s;
             }
 
+            public LSLString(LSLInteger i)
+            {
+                string s = String.Format("{0}", i);
+                m_string = s;
+            }
+
             #endregion
 
             #region Operators