5 files changed, 524 insertions, 182 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 26969a5..c84afee 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -369,7 +369,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         }
 
         // convert a LSL_Rotation to a Quaternion
-        protected Quaternion Rot2Quaternion(LSL_Rotation r)
+        public static Quaternion Rot2Quaternion(LSL_Rotation r)
         {
             Quaternion q = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
             q.Normalize();
@@ -1204,10 +1204,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if ((status & ScriptBaseClass.STATUS_PHANTOM) == ScriptBaseClass.STATUS_PHANTOM)
             {
-                if (value != 0)
-                    m_host.ScriptSetPhantomStatus(true);
-                else
-                    m_host.ScriptSetPhantomStatus(false);
+                if (m_host.ParentGroup != null)
+                    m_host.ParentGroup.ScriptSetPhantomStatus(value != 0);
             }
 
             if ((status & ScriptBaseClass.STATUS_CAST_SHADOWS) == ScriptBaseClass.STATUS_CAST_SHADOWS)
@@ -2063,6 +2061,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 return llGetRootRotation();
             }
+            
             m_host.AddScriptLPS(1);
             Quaternion q = m_host.GetWorldRotation();
             return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
@@ -6446,9 +6445,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (m_host.ParentGroup != null)
             {
                 if (!m_host.ParentGroup.IsDeleted)
-                {
-                    m_host.ParentGroup.RootPart.ScriptSetVolumeDetect(detect!=0);
-                }
+                    m_host.ParentGroup.ScriptSetVolumeDetect(detect != 0);
             }
         }
 
@@ -6456,7 +6453,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// This is a depecated function so this just replicates the result of
         /// invoking it in SL
         /// </summary>
-
         public void llRemoteLoadScript(string target, string name, int running, int start_param)
         {
             m_host.AddScriptLPS(1);
@@ -7254,14 +7250,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                              return;
 
                          string ph = rules.Data[idx++].ToString();
-                         bool phantom;
 
-                         if (ph.Equals("1"))
-                             phantom = true;
-                         else
-                             phantom = false;
+                         if (m_host.ParentGroup != null)
+                            m_host.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1"));
 
-                         part.ScriptSetPhantomStatus(phantom);
                          break;
 
                      case (int)ScriptBaseClass.PRIM_PHYSICS:
@@ -7282,14 +7274,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         if (remain < 1)
                             return;
                         string temp = rules.Data[idx++].ToString();
-                        bool tempOnRez;
 
-                        if (temp.Equals("1"))
-                            tempOnRez = true;
-                        else
-                            tempOnRez = false;
+                        if (m_host.ParentGroup != null)
+                            m_host.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1"));
 
-                        part.ScriptSetTemporaryStatus(tempOnRez);
                         break;
 
                     case (int)ScriptBaseClass.PRIM_TEXGEN:
@@ -7662,7 +7650,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             case ScriptBaseClass.PRIM_TYPE_BOX:
                             case ScriptBaseClass.PRIM_TYPE_CYLINDER:
                             case ScriptBaseClass.PRIM_TYPE_PRISM:
-                                res.Add(new LSL_Integer(Shape.ProfileCurve));
+                                res.Add(new LSL_Integer(Shape.ProfileCurve) & 0xf0);    // Isolate hole shape nibble.
                                 res.Add(new LSL_Vector(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0));
                                 res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0));
                                 res.Add(new LSL_Vector(Shape.PathTwistBegin / 100.0, Shape.PathTwist / 100.0, 0));
@@ -7671,7 +7659,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 break;
 
                             case ScriptBaseClass.PRIM_TYPE_SPHERE:
-                                res.Add(new LSL_Integer(Shape.ProfileCurve));
+                                res.Add(new LSL_Integer(Shape.ProfileCurve) & 0xf0);    // Isolate hole shape nibble.
                                 res.Add(new LSL_Vector(Shape.PathBegin / 50000.0, 1 - Shape.PathEnd / 50000.0, 0));
                                 res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0));
                                 res.Add(new LSL_Vector(Shape.PathTwistBegin / 100.0, Shape.PathTwist / 100.0, 0));
@@ -7687,7 +7675,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             case ScriptBaseClass.PRIM_TYPE_TUBE:
                             case ScriptBaseClass.PRIM_TYPE_TORUS:
                                 // holeshape
-                                res.Add(new LSL_Integer(Shape.ProfileCurve));
+                                res.Add(new LSL_Integer(Shape.ProfileCurve) & 0xf0);    // Isolate hole shape nibble.
 
                                 // cut
                                 res.Add(new LSL_Vector(Shape.PathBegin / 50000.0, 1 - Shape.PathEnd / 50000.0, 0));
@@ -10578,9 +10566,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public static string GetLine(UUID assetID, int line, int maxLength)
+        /// <summary>
+        /// Get a notecard line.
+        /// </summary>
+        /// <param name="assetID"></param>
+        /// <param name="line">Lines start at index 0</param>
+        /// <returns></returns>
+        public static string GetLine(UUID assetID, int lineNumber)
         {
-            if (line < 0)
+            if (lineNumber < 0)
                 return "";
 
             string data;
@@ -10592,17 +10586,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 m_Notecards[assetID].lastRef = DateTime.Now;
 
-                if (line >= m_Notecards[assetID].text.Length)
+                if (lineNumber >= m_Notecards[assetID].text.Length)
                     return "\n\n\n";
 
-                data = m_Notecards[assetID].text[line];
-                if (data.Length > maxLength)
-                    data = data.Substring(0, maxLength);
+                data = m_Notecards[assetID].text[lineNumber];
 
                 return data;
             }
         }
 
+        /// <summary>
+        /// Get a notecard line.
+        /// </summary>
+        /// <param name="assetID"></param>
+        /// <param name="line">Lines start at index 0</param>
+        /// <param name="maxLength">Maximum length of the returned line.  Longer lines will be truncated</para>
+        /// <returns></returns>
+        public static string GetLine(UUID assetID, int lineNumber, int maxLength)
+        {
+            string line = GetLine(assetID, lineNumber);
+
+            if (line.Length > maxLength)
+                line = line.Substring(0, maxLength);
+
+            return line;
+        }
+
         public static void CacheCheck()
         {
             foreach (UUID key in new List<UUID>(m_Notecards.Keys))
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 8093502..d791885 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -28,11 +28,16 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
 using System.Runtime.Remoting.Lifetime;
 using System.Text;
 using System.Net;
 using System.Threading;
+using System.Xml;
+using log4net;
 using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using Nini.Config;
 using OpenSim;
 using OpenSim.Framework;
@@ -119,6 +124,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
     [Serializable]
     public class OSSL_Api : MarshalByRefObject, IOSSL_Api, IScriptApi
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         internal IScriptEngine m_ScriptEngine;
         internal ILSL_Api m_LSL_Api = null; // get a reference to the LSL API so we can call methods housed there
         internal SceneObjectPart m_host;
@@ -348,20 +355,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             System.Threading.Thread.Sleep(delay);
         }
 
-        //
-        // OpenSim functions
-        //
         public LSL_Integer osSetTerrainHeight(int x, int y, double val)
         {
             CheckThreatLevel(ThreatLevel.High, "osSetTerrainHeight");
             return SetTerrainHeight(x, y, val);
         }
+
         public LSL_Integer osTerrainSetHeight(int x, int y, double val)
         {
             CheckThreatLevel(ThreatLevel.High, "osTerrainSetHeight");
             OSSLDeprecated("osTerrainSetHeight", "osSetTerrainHeight");
             return SetTerrainHeight(x, y, val);
         }
+
         private LSL_Integer SetTerrainHeight(int x, int y, double val)
         {
             m_host.AddScriptLPS(1);
@@ -384,12 +390,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.None, "osGetTerrainHeight");
             return GetTerrainHeight(x, y);
         }
+
         public LSL_Float osTerrainGetHeight(int x, int y)
         {
             CheckThreatLevel(ThreatLevel.None, "osTerrainGetHeight");
             OSSLDeprecated("osTerrainGetHeight", "osGetTerrainHeight");
             return GetTerrainHeight(x, y);
         }
+
         private LSL_Float GetTerrainHeight(int x, int y)
         {
             m_host.AddScriptLPS(1);
@@ -862,7 +870,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 ScenePresence target = (ScenePresence)World.Entities[avatarID];
                 if (target != null)
                 {
-                    UUID animID=UUID.Zero;
+                    UUID animID = UUID.Zero;
                     lock (m_host.TaskInventory)
                     {
                         foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
@@ -1021,6 +1029,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             drawList += "PenColor " + color + "; ";
             return drawList;
         }
+
         // Deprecated
         public string osSetPenColour(string drawList, string colour)
         {
@@ -1182,11 +1191,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             OSSLDeprecated("osSunGetParam", "osGetSunParam");
             return GetSunParam(param);
         }
+
         public double osGetSunParam(string param)
         {
             CheckThreatLevel(ThreatLevel.None, "osGetSunParam");
             return GetSunParam(param);
         }
+
         private double GetSunParam(string param)
         {
             m_host.AddScriptLPS(1);
@@ -1208,11 +1219,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             OSSLDeprecated("osSunSetParam", "osSetSunParam");
             SetSunParam(param, value);
         }
+
         public void osSetSunParam(string param, double value)
         {
             CheckThreatLevel(ThreatLevel.None, "osSetSunParam");
             SetSunParam(param, value);
         }
+
         private void SetSunParam(string param, double value)
         {
             m_host.AddScriptLPS(1);
@@ -1222,10 +1235,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 module.SetSunParameter(param, value);
             }
-
         }
 
-
         public string osWindActiveModelPluginName()
         {
             CheckThreatLevel(ThreatLevel.None, "osWindActiveModelPluginName");
@@ -1304,12 +1315,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             OSSLDeprecated(functionName, "osSetParcelDetails");
             SetParcelDetails(pos, rules, functionName);
         }
+
         public void osSetParcelDetails(LSL_Vector pos, LSL_List rules)
         {
             const string functionName = "osSetParcelDetails";
             CheckThreatLevel(ThreatLevel.High, functionName);
             SetParcelDetails(pos, rules, functionName);
         }
+
         private void SetParcelDetails(LSL_Vector pos, LSL_List rules, string functionName)
         {
             m_host.AddScriptLPS(1);
@@ -1429,8 +1442,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 voiceModule.setLandSIPAddress(SIPAddress,land.LandData.GlobalID);
             else
                 OSSLError("osSetParcelSIPAddress: No voice module enabled for this land");
-
-
         }
 
         public string osGetScriptEngineName()
@@ -1683,8 +1694,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return jsondata;
         }
 
-        // send a message to to object identified by the given UUID, a script in the object must implement the dataserver function
-        // the dataserver function is passed the ID of the calling function and a string message
+        /// <summary>
+        /// Send a message to to object identified by the given UUID
+        /// </summary>
+        /// <remarks>
+        /// A script in the object must implement the dataserver function
+        /// the dataserver function is passed the ID of the calling function and a string message
+        /// </remarks>
+        /// <param name="objectUUID"></param>
+        /// <param name="message"></param>
         public void osMessageObject(LSL_Key objectUUID, string message)
         {
             CheckThreatLevel(ThreatLevel.Low, "osMessageObject");
@@ -1699,34 +1717,56 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     "dataserver", resobj, new DetectParams[0]));
         }
 
-
-        // This needs ThreatLevel high. It is an excellent griefer tool,
-        // In a loop, it can cause asset bloat and DOS levels of asset
-        // writes.
-        //
+        /// <summary>
+        /// Write a notecard directly to the prim's inventory.
+        /// </summary>
+        /// <remarks>
+        /// This needs ThreatLevel high. It is an excellent griefer tool,
+        /// In a loop, it can cause asset bloat and DOS levels of asset
+        /// writes.
+        /// </remarks>
+        /// <param name="notecardName">The name of the notecard to write.</param>
+        /// <param name="contents">The contents of the notecard.</param>
         public void osMakeNotecard(string notecardName, LSL_Types.list contents)
         {
             CheckThreatLevel(ThreatLevel.High, "osMakeNotecard");
             m_host.AddScriptLPS(1);
 
-            // Create new asset
-            AssetBase asset = new AssetBase(UUID.Random(), notecardName, (sbyte)AssetType.Notecard, m_host.OwnerID.ToString());
-            asset.Description = "Script Generated Notecard";
-            string notecardData = String.Empty;
+            StringBuilder notecardData = new StringBuilder();
 
-            for (int i = 0; i < contents.Length; i++) {
-                notecardData += contents.GetLSLStringItem(i) + "\n";
-            }
+            for (int i = 0; i < contents.Length; i++)
+                notecardData.Append((string)(contents.GetLSLStringItem(i) + "\n"));
+
+            SaveNotecard(notecardName, "Script generated notecard", notecardData.ToString(), false);
+        }
 
-            int textLength = notecardData.Length;
-            notecardData = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length "
-            + textLength.ToString() + "\n" + notecardData + "}\n";
+        /// <summary>
+        /// Save a notecard to prim inventory.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="description">Description of notecard</param>
+        /// <param name="notecardData"></param>
+        /// <param name="forceSameName">
+        /// If true, then if an item exists with the same name, it is replaced.
+        /// If false, then a new item is created witha slightly different name (e.g. name 1)
+        /// </param>
+        /// <returns>Prim inventory item created.</returns>
+        protected TaskInventoryItem SaveNotecard(string name, string description, string data, bool forceSameName)
+        {
+            // Create new asset
+            AssetBase asset = new AssetBase(UUID.Random(), name, (sbyte)AssetType.Notecard, m_host.OwnerID.ToString());
+            asset.Description = description;
 
-            asset.Data = Util.UTF8.GetBytes(notecardData);
+            int textLength = data.Length;
+            data
+                = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length "
+                    + textLength.ToString() + "\n" + data + "}\n";
+
+            asset.Data = Util.UTF8.GetBytes(data);
             World.AssetService.Store(asset);
 
             // Create Task Entry
-            TaskInventoryItem taskItem=new TaskInventoryItem();
+            TaskInventoryItem taskItem = new TaskInventoryItem();
 
             taskItem.ResetIDs(m_host.UUID);
             taskItem.ParentID = m_host.UUID;
@@ -1748,28 +1788,53 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             taskItem.PermsMask = 0;
             taskItem.AssetID = asset.FullID;
 
-            m_host.Inventory.AddInventoryItem(taskItem, false);
+            if (forceSameName)
+                m_host.Inventory.AddInventoryItemExclusive(taskItem, false);
+            else
+                m_host.Inventory.AddInventoryItem(taskItem, false);
+
+            return taskItem;
         }
 
+        /// <summary>
+        /// Load the notecard data found at the given prim inventory item name or asset uuid.
+        /// </summary>
+        /// <param name="notecardNameOrUuid"></param>
+        /// <returns>The text loaded.  Null if no notecard was found.</returns>
+        protected string LoadNotecard(string notecardNameOrUuid)
+        {
+            UUID assetID = CacheNotecard(notecardNameOrUuid);
+            StringBuilder notecardData = new StringBuilder();
+
+            for (int count = 0; count < NotecardCache.GetLines(assetID); count++)
+            {
+                string line = NotecardCache.GetLine(assetID, count) + "\n";
+
+//                m_log.DebugFormat("[OSSL]: From notecard {0} loading line {1}", notecardNameOrUuid, line);
 
-        /*Instead of using the LSL Dataserver event to pull notecard data,
-                 this will simply read the requested line and return its data as a string.
+                notecardData.Append(line);
+            }
 
-                 Warning - due to the synchronous method this function uses to fetch assets, its use
-                           may be dangerous and unreliable while running in grid mode.
-                */
-        public string osGetNotecardLine(string name, int line)
-        {
-            CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNotecardLine");
-            m_host.AddScriptLPS(1);
+            return notecardData.ToString();
+        }
 
+        /// <summary>
+        /// Cache a notecard's contents.
+        /// </summary>
+        /// <param name="notecardNameOrUuid"></param>
+        /// <returns>
+        /// The asset id of the notecard, which is used for retrieving the cached data.
+        /// UUID.Zero if no asset could be found.
+        /// </returns>
+        protected UUID CacheNotecard(string notecardNameOrUuid)
+        {
             UUID assetID = UUID.Zero;
 
-            if (!UUID.TryParse(name, out assetID))
+            if (!UUID.TryParse(notecardNameOrUuid, out assetID))
             {
                 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
                 {
-                    if (item.Type == 7 && item.Name == name)
+                    if (item.Type == 7 && item.Name == notecardNameOrUuid)
                     {
                         assetID = item.AssetID;
                     }
@@ -1777,114 +1842,100 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             if (assetID == UUID.Zero)
-            {
-                OSSLShoutError("Notecard '" + name + "' could not be found.");
-                return "ERROR!";
-            }
+                return UUID.Zero;
 
             if (!NotecardCache.IsCached(assetID))
             {
                 AssetBase a = World.AssetService.Get(assetID.ToString());
-                if (a != null)
-                {
-                    System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
-                    string data = enc.GetString(a.Data);
-                    NotecardCache.Cache(assetID, data);
-                }
-                else
-                {
-                    OSSLShoutError("Notecard '" + name + "' could not be found.");
-                    return "ERROR!";
-                }
-            };
 
-            return NotecardCache.GetLine(assetID, line, 255);
+                if (a == null)
+                    return UUID.Zero;
 
+                System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
+                string data = enc.GetString(a.Data);
+                NotecardCache.Cache(assetID, data);
+            };
 
+            return assetID;
         }
 
-        /*Instead of using the LSL Dataserver event to pull notecard data line by line,
-          this will simply read the entire notecard and return its data as a string.
+        /// <summary>
+        /// Directly get an entire notecard at once.
+        /// </summary>
+        /// <remarks>
+        /// Instead of using the LSL Dataserver event to pull notecard data
+        /// this will simply read the entire notecard and return its data as a string.
+        ///
+        /// Warning - due to the synchronous method this function uses to fetch assets, its use
+        ///            may be dangerous and unreliable while running in grid mode.
+        /// </remarks>
+        /// <param name="name">Name of the notecard or its asset id</param>
+        /// <param name="line">The line number to read.  The first line is line 0</param>
+        /// <returns>Notecard line</returns>
+        public string osGetNotecardLine(string name, int line)
+        {
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNotecardLine");
+            m_host.AddScriptLPS(1);
+
+            UUID assetID = CacheNotecard(name);
+
+            if (assetID == UUID.Zero)
+            {
+                OSSLShoutError("Notecard '" + name + "' could not be found.");
+                return "ERROR!";
+            }
 
-          Warning - due to the synchronous method this function uses to fetch assets, its use
-                    may be dangerous and unreliable while running in grid mode.
-         */
+            return NotecardCache.GetLine(assetID, line);
+        }
 
+        /// <summary>
+        /// Get an entire notecard at once.
+        /// </summary>
+        /// <remarks>
+        /// Instead of using the LSL Dataserver event to pull notecard data line by line,
+        /// this will simply read the entire notecard and return its data as a string.
+        ///
+        /// Warning - due to the synchronous method this function uses to fetch assets, its use
+        ///            may be dangerous and unreliable while running in grid mode.
+        /// </remarks>
+        /// <param name="name">Name of the notecard or its asset id</param>
+        /// <returns>Notecard text</returns>
         public string osGetNotecard(string name)
         {
             CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNotecard");
             m_host.AddScriptLPS(1);
 
-            UUID assetID = UUID.Zero;
-            string NotecardData = "";
-
-            if (!UUID.TryParse(name, out assetID))
-            {
-                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
-                {
-                    if (item.Type == 7 && item.Name == name)
-                    {
-                        assetID = item.AssetID;
-                    }
-                }
-            }
+            string text = LoadNotecard(name);
 
-            if (assetID == UUID.Zero)
+            if (text == null)
             {
                 OSSLShoutError("Notecard '" + name + "' could not be found.");
                 return "ERROR!";
             }
-
-            if (!NotecardCache.IsCached(assetID))
-            {
-                AssetBase a = World.AssetService.Get(assetID.ToString());
-                if (a != null)
-                {
-                    System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
-                    string data = enc.GetString(a.Data);
-                    NotecardCache.Cache(assetID, data);
-                }
-                else
-                {
-                    OSSLShoutError("Notecard '" + name + "' could not be found.");
-                    return "ERROR!";
-                }
-            };
-
-            for (int count = 0; count < NotecardCache.GetLines(assetID); count++)
+            else
             {
-                NotecardData += NotecardCache.GetLine(assetID, count, 255) + "\n";
+                return text;
             }
-
-            return NotecardData;
-
-
         }
 
-        /*Instead of using the LSL Dataserver event to pull notecard data,
-          this will simply read the number of note card lines and return this data as an integer.
-
-          Warning - due to the synchronous method this function uses to fetch assets, its use
-                    may be dangerous and unreliable while running in grid mode.
-         */
-
+        /// <summary>
+        /// Get the number of lines in the given notecard.
+        /// </summary>
+        /// <remarks>
+        /// Instead of using the LSL Dataserver event to pull notecard data,
+        /// this will simply read the number of note card lines and return this data as an integer.
+        ///
+        /// Warning - due to the synchronous method this function uses to fetch assets, its use
+        ///            may be dangerous and unreliable while running in grid mode.
+        /// </remarks>
+        /// <param name="name">Name of the notecard or its asset id</param>
+        /// <returns></returns>
         public int osGetNumberOfNotecardLines(string name)
         {
             CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNumberOfNotecardLines");
             m_host.AddScriptLPS(1);
 
-            UUID assetID = UUID.Zero;
-
-            if (!UUID.TryParse(name, out assetID))
-            {
-                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
-                {
-                    if (item.Type == 7 && item.Name == name)
-                    {
-                        assetID = item.AssetID;
-                    }
-                }
-            }
+            UUID assetID = CacheNotecard(name);
 
             if (assetID == UUID.Zero)
             {
@@ -1892,22 +1943,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return -1;
             }
 
-            if (!NotecardCache.IsCached(assetID))
-            {
-                AssetBase a = World.AssetService.Get(assetID.ToString());
-                if (a != null)
-                {
-                    System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
-                    string data = enc.GetString(a.Data);
-                    NotecardCache.Cache(assetID, data);
-                }
-                else
-                {
-                    OSSLShoutError("Notecard '" + name + "' could not be found.");
-                    return -1;
-                }
-            };
-
             return NotecardCache.GetLines(assetID);
         }
 
@@ -1947,15 +1982,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 return "";
             }
-
         }
 
+        /// <summary>
+        /// Get the nickname of this grid, as set in the [GridInfo] config section.
+        /// </summary>
+        /// <remarks>
         /// Threat level is Moderate because intentional abuse, for instance
         /// scripts that are written to be malicious only on one grid,
         /// for instance in a HG scenario, are a distinct possibility.
-        ///
-        /// Use value from the config file and return it.
-        ///
+        /// </remarks>
+        /// <returns></returns>
         public string osGetGridNick()
         {
             CheckThreatLevel(ThreatLevel.Moderate, "osGetGridNick");
@@ -2063,12 +2100,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return World.RegionInfo.RegionSettings.LoadedCreationID;
         }
 
-        // Threat level is 'Low' because certain users could possibly be tricked into
-        // dropping an unverified script into one of their own objects, which could
-        // then gather the physical construction details of the object and transmit it
-        // to an unscrupulous third party, thus permitting unauthorized duplication of
-        // the object's form.
-        //
+        /// <summary>
+        /// Get the primitive parameters of a linked prim.
+        /// </summary>
+        /// <remarks>
+        /// Threat level is 'Low' because certain users could possibly be tricked into
+        /// dropping an unverified script into one of their own objects, which could
+        /// then gather the physical construction details of the object and transmit it
+        /// to an unscrupulous third party, thus permitting unauthorized duplication of
+        /// the object's form.
+        /// </remarks>
+        /// <param name="linknumber"></param>
+        /// <param name="rules"></param>
+        /// <returns></returns>
         public LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules)
         {
             CheckThreatLevel(ThreatLevel.High, "osGetLinkPrimitiveParams");
@@ -2083,25 +2127,122 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return retVal;
         }
 
-        public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, LSL_Key cloneFrom)
+        public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard)
         {
             CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
-            //QueueUserWorkItem
 
             INPCModule module = World.RequestModuleInterface<INPCModule>();
             if (module != null)
             {
+                AvatarAppearance appearance = null;
+
+                UUID id;
+                if (UUID.TryParse(notecard, out id))
+                {
+                    ScenePresence clonePresence = World.GetScenePresence(id);
+                    if (clonePresence != null)
+                        appearance = clonePresence.Appearance;
+                }
+
+                if (appearance == null)
+                {
+                    string appearanceSerialized = LoadNotecard(notecard);
+
+                    if (appearanceSerialized != null)
+                    {
+                        OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
+                        appearance = new AvatarAppearance();
+                        appearance.Unpack(appearanceOsd);
+                    }
+                }
+
+                if (appearance == null)
+                    return new LSL_Key(UUID.Zero.ToString());
+
                 UUID x = module.CreateNPC(firstname,
                                           lastname,
                                           new Vector3((float) position.x, (float) position.y, (float) position.z),
                                           World,
-                                          new UUID(cloneFrom));
+                                          appearance);
 
                 return new LSL_Key(x.ToString());
             }
+
             return new LSL_Key(UUID.Zero.ToString());
         }
 
+        /// <summary>
+        /// Save the current appearance of the NPC permanently to the named notecard.
+        /// </summary>
+        /// <param name="avatar"></param>
+        /// <param name="notecard">The name of the notecard to which to save the appearance.</param>
+        /// <returns>The asset ID of the notecard saved.</returns>
+        public LSL_Key osNpcSaveAppearance(LSL_Key npc, string notecard)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcSaveAppearance");
+
+            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
+
+            if (npcModule != null)
+            {
+                UUID npcId;
+                if (!UUID.TryParse(npc.m_string, out npcId))
+                    return new LSL_Key(UUID.Zero.ToString());
+
+                if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
+                    return new LSL_Key(UUID.Zero.ToString());
+
+                return SaveAppearanceToNotecard(npcId, notecard);
+            }
+
+            return new LSL_Key(UUID.Zero.ToString());
+        }
+
+        public void osNpcLoadAppearance(LSL_Key npc, string notecard)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcLoadAppearance");
+
+            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
+
+            if (npcModule != null)
+            {
+                UUID npcId;
+                if (!UUID.TryParse(npc.m_string, out npcId))
+                    return;
+
+                string appearanceSerialized = LoadNotecard(notecard);
+                OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
+//                OSD a = OSDParser.DeserializeLLSDXml(appearanceSerialized);
+//                Console.WriteLine("appearanceSerialized {0}", appearanceSerialized);
+//                Console.WriteLine("a.Type {0}, a.ToString() {1}", a.Type, a);
+                AvatarAppearance appearance = new AvatarAppearance();
+                appearance.Unpack(appearanceOsd);
+
+                npcModule.SetNPCAppearance(npcId, appearance, m_host.ParentGroup.Scene);
+            }
+        }
+
+        public LSL_Vector osNpcGetPos(LSL_Key npc)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcGetPos");
+
+            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
+            if (npcModule != null)
+            {
+                UUID npcId;
+                if (!UUID.TryParse(npc.m_string, out npcId))
+                    return new LSL_Vector(0, 0, 0);
+
+                if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
+                    return new LSL_Vector(0, 0, 0);
+
+                Vector3 pos = World.GetScenePresence(npcId).AbsolutePosition;
+                return new LSL_Vector(pos.X, pos.Y, pos.Z);
+            }
+
+            return new LSL_Vector(0, 0, 0);
+        }
+
         public void osNpcMoveTo(LSL_Key npc, LSL_Vector position)
         {
             CheckThreatLevel(ThreatLevel.High, "osNpcMoveTo");
@@ -2109,11 +2250,87 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             INPCModule module = World.RequestModuleInterface<INPCModule>();
             if (module != null)
             {
+                UUID npcId;
+                if (!UUID.TryParse(npc.m_string, out npcId))
+                    return;
+                
                 Vector3 pos = new Vector3((float) position.x, (float) position.y, (float) position.z);
-                module.MoveToTarget(new UUID(npc.m_string), World, pos);
+                module.MoveToTarget(npcId, World, pos, false, true);
             }
         }
 
+        public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector target, int options)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcMoveToTarget");
+
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                UUID npcId;
+                if (!UUID.TryParse(npc.m_string, out npcId))
+                    return;
+
+                Vector3 pos = new Vector3((float)target.x, (float)target.y, (float)target.z);
+                module.MoveToTarget(
+                    new UUID(npc.m_string),
+                    World,
+                    pos,
+                    (options & ScriptBaseClass.OS_NPC_NO_FLY) != 0,
+                    (options & ScriptBaseClass.OS_NPC_LAND_AT_TARGET) != 0);
+            }
+        }
+
+        public LSL_Rotation osNpcGetRot(LSL_Key npc)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcGetRot");
+
+            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
+            if (npcModule != null)
+            {
+                UUID npcId;
+                if (!UUID.TryParse(npc.m_string, out npcId))
+                    return new LSL_Rotation(Quaternion.Identity.X, Quaternion.Identity.Y, Quaternion.Identity.Z, Quaternion.Identity.W);
+
+                if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
+                    return new LSL_Rotation(Quaternion.Identity.X, Quaternion.Identity.Y, Quaternion.Identity.Z, Quaternion.Identity.W);
+
+                ScenePresence sp = World.GetScenePresence(npcId);
+                Quaternion rot = sp.Rotation;
+
+                return new LSL_Rotation(rot.X, rot.Y, rot.Z, rot.W);
+            }
+
+            return new LSL_Rotation(Quaternion.Identity.X, Quaternion.Identity.Y, Quaternion.Identity.Z, Quaternion.Identity.W);
+        }
+
+        public void osNpcSetRot(LSL_Key npc, LSL_Rotation rotation)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osNpcSetRot");
+
+            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
+            if (npcModule != null)
+            {
+                UUID npcId;
+                if (!UUID.TryParse(npc.m_string, out npcId))
+                    return;
+
+                if (!npcModule.IsNPC(npcId, m_host.ParentGroup.Scene))
+                    return;
+
+                ScenePresence sp = World.GetScenePresence(npcId);
+                sp.Rotation = LSL_Api.Rot2Quaternion(rotation);
+            }
+        }
+
+        public void osNpcStopMoveToTarget(LSL_Key npc)
+        {
+            CheckThreatLevel(ThreatLevel.VeryLow, "osNpcStopMoveTo");
+
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+                module.StopMoveToTarget(new UUID(npc.m_string), World);
+        }
+
         public void osNpcSay(LSL_Key npc, string message)
         {
             CheckThreatLevel(ThreatLevel.High, "osNpcSay");
@@ -2135,6 +2352,64 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 module.DeleteNPC(new UUID(npc.m_string), World);
             }
         }
+
+        /// <summary>
+        /// Save the current appearance of the script owner permanently to the named notecard.
+        /// </summary>
+        /// <param name="notecard">The name of the notecard to which to save the appearance.</param>
+        /// <returns>The asset ID of the notecard saved.</returns>
+        public LSL_Key osOwnerSaveAppearance(string notecard)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osOwnerSaveAppearance");
+
+            return SaveAppearanceToNotecard(m_host.OwnerID, notecard);
+        }
+
+        public LSL_Key osAgentSaveAppearance(LSL_Key avatarId, string notecard)
+        {
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osAgentSaveAppearance");
+
+            return SaveAppearanceToNotecard(avatarId, notecard);
+        }
+
+        protected LSL_Key SaveAppearanceToNotecard(ScenePresence sp, string notecard)
+        {
+            IAvatarFactory appearanceModule = World.RequestModuleInterface<IAvatarFactory>();
+
+            if (appearanceModule != null)
+            {
+                appearanceModule.SaveBakedTextures(sp.UUID);
+                OSDMap appearancePacked = sp.Appearance.Pack();
+
+                TaskInventoryItem item
+                    = SaveNotecard(notecard, "Avatar Appearance", Util.GetFormattedXml(appearancePacked as OSD), true);
+
+                return new LSL_Key(item.AssetID.ToString());
+            }
+            else
+            {
+                return new LSL_Key(UUID.Zero.ToString());
+            }
+        }
+
+        protected LSL_Key SaveAppearanceToNotecard(UUID avatarId, string notecard)
+        {
+            ScenePresence sp = World.GetScenePresence(avatarId);
+
+            if (sp == null || sp.IsChildAgent)
+                return new LSL_Key(UUID.Zero.ToString());
+
+            return SaveAppearanceToNotecard(sp, notecard);
+        }
+
+        protected LSL_Key SaveAppearanceToNotecard(LSL_Key rawAvatarId, string notecard)
+        {
+            UUID avatarId;
+            if (!UUID.TryParse(rawAvatarId, out avatarId))
+                return new LSL_Key(UUID.Zero.ToString());
+
+            return SaveAppearanceToNotecard(avatarId, notecard);
+        }
         
         /// <summary>
         /// Get current region's map texture UUID
@@ -2344,10 +2619,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             obj.Shape.ProjectionFocus = (float)focus;
             obj.Shape.ProjectionAmbiance = (float)amb;
 
-
             obj.ParentGroup.HasGroupChanged = true;
             obj.ScheduleFullUpdate();
-
         }
 
         /// <summary>
@@ -2372,6 +2645,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             });
+
             return result;
         }
 
@@ -2391,4 +2665,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return date.ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 19352f0..87cfe1a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -168,12 +168,21 @@ 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);
+        key osNpcCreate(string user, string name, vector position, string notecard);
+        LSL_Key osNpcSaveAppearance(key npc, string notecard);
+        void osNpcLoadAppearance(key npc, string notecard);
+        vector osNpcGetPos(key npc);
         void osNpcMoveTo(key npc, vector position);
+        void osNpcMoveToTarget(key npc, vector target, int options);
+        rotation osNpcGetRot(key npc);
+        void osNpcSetRot(LSL_Key npc, rotation rot);
+        void osNpcStopMoveToTarget(LSL_Key npc);
         void osNpcSay(key npc, string message);
         void osNpcRemove(key npc);
 
+        LSL_Key osOwnerSaveAppearance(string notecard);
+        LSL_Key osAgentSaveAppearance(key agentId, string notecard);
+
         key osGetMapTexture();
         key osGetRegionMapTexture(string regionName);
         LSL_List osGetRegionStats();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 3f90788..e82c281 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -591,6 +591,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int STATS_ACTIVE_SCRIPTS = 19;
         public const int STATS_SCRIPT_LPS = 20;
 
+        // Constants for osNpc* functions
+        public const int OS_NPC_FLY = 0;
+        public const int OS_NPC_NO_FLY = 1;
+        public const int OS_NPC_LAND_AT_TARGET = 2;
+
         public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
         public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 7c59098..bbc8cc6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -483,11 +483,46 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osNpcCreate(user, name, position, cloneFrom);
         }
 
+        public key osNpcSaveAppearance(key npc, string notecard)
+        {
+            return m_OSSL_Functions.osNpcSaveAppearance(npc, notecard);
+        }
+
+        public void osNpcLoadAppearance(key npc, string notecard)
+        {
+            m_OSSL_Functions.osNpcLoadAppearance(npc, notecard);
+        }
+
+        public vector osNpcGetPos(LSL_Key npc)
+        {
+            return m_OSSL_Functions.osNpcGetPos(npc);
+        }
+
         public void osNpcMoveTo(key npc, vector position)
         {
             m_OSSL_Functions.osNpcMoveTo(npc, position);
         }
 
+        public void osNpcMoveToTarget(key npc, vector target, int options)
+        {
+            m_OSSL_Functions.osNpcMoveToTarget(npc, target, options);
+        }
+
+        public rotation osNpcGetRot(key npc)
+        {
+            return m_OSSL_Functions.osNpcGetRot(npc);
+        }
+
+        public void osNpcSetRot(key npc, rotation rot)
+        {
+            m_OSSL_Functions.osNpcSetRot(npc, rot);
+        }
+
+        public void osNpcStopMoveToTarget(LSL_Key npc)
+        {
+            m_OSSL_Functions.osNpcStopMoveToTarget(npc);
+        }
+
         public void osNpcSay(key npc, string message)
         {
             m_OSSL_Functions.osNpcSay(npc, message);
@@ -498,6 +533,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_OSSL_Functions.osNpcRemove(npc);
         }
 
+        public LSL_Key osOwnerSaveAppearance(string notecard)
+        {
+            return m_OSSL_Functions.osOwnerSaveAppearance(notecard);
+        }
+
+        public LSL_Key osAgentSaveAppearance(LSL_Key agentId, string notecard)
+        {
+            return m_OSSL_Functions.osAgentSaveAppearance(agentId, notecard);
+        }
+
         public OSSLPrim Prim;
 
         [Serializable]