7 files changed, 100 insertions, 70 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ce7d97c..fd6d64c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5050,7 +5050,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
 
-            result.Add(src.Substring(start,length).Trim());
+            result.Add(new LSL_String(src.Substring(start,length).Trim()));
 
             return result;
         }
@@ -6900,7 +6900,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // retain pathcurve
             shapeBlock.PathCurve = part.Shape.PathCurve;
 
-            part.Shape.SetSculptData((byte)type, sculptId);
+            part.Shape.SetSculptProperties((byte)type, sculptId);
             part.Shape.SculptEntry = true;
             part.UpdateShape(shapeBlock);
         }
@@ -7391,7 +7391,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID[] anims;
             anims = av.Animator.GetAnimationArray();
             foreach (UUID foo in anims)
-                l.Add(foo.ToString());
+                l.Add(new LSL_Key(foo.ToString()));
             return l;
         }
 
@@ -7926,17 +7926,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     case (int)ScriptBaseClass.PRIM_TEXT:
                         Color4 textColor = part.GetTextColor();
-                        res.Add(part.Text);
+                        res.Add(new LSL_String(part.Text));
                         res.Add(new LSL_Vector(textColor.R,
                                                textColor.G,
                                                textColor.B));
                         res.Add(new LSL_Float(textColor.A));
                         break;
                     case (int)ScriptBaseClass.PRIM_NAME:
-                        res.Add(part.Name);
+                        res.Add(new LSL_String(part.Name));
                         break;
                     case (int)ScriptBaseClass.PRIM_DESC:
-                        res.Add(part.Description);
+                        res.Add(new LSL_String(part.Description));
                         break;
                     case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
                         res.Add(new LSL_Rotation(part.RotationOffset.X, part.RotationOffset.Y, part.RotationOffset.Z, part.RotationOffset.W));
@@ -9895,8 +9895,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 foreach (KeyValuePair<UUID, int> detectedParams in land.GetLandObjectOwners())
                 {
-                    ret.Add(detectedParams.Key.ToString());
-                    ret.Add(detectedParams.Value);
+                    ret.Add(new LSL_String(detectedParams.Key.ToString()));
+                    ret.Add(new LSL_Integer(detectedParams.Value));
                 }
             }
             ScriptSleep(2000);
@@ -9946,25 +9946,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 switch (o.ToString())
                 {
                     case "0":
-                        ret = ret + new LSL_List(land.Name);
+                        ret.Add(new LSL_String(land.Name));
                         break;
                     case "1":
-                        ret = ret + new LSL_List(land.Description);
+                        ret.Add(new LSL_String(land.Description));
                         break;
                     case "2":
-                        ret = ret + new LSL_List(land.OwnerID.ToString());
+                        ret.Add(new LSL_Key(land.OwnerID.ToString()));
                         break;
                     case "3":
-                        ret = ret + new LSL_List(land.GroupID.ToString());
+                        ret.Add(new LSL_Key(land.GroupID.ToString()));
                         break;
                     case "4":
-                        ret = ret + new LSL_List(land.Area);
+                        ret.Add(new LSL_Integer(land.Area));
                         break;
                     case "5":
-                        ret = ret + new LSL_List(land.GlobalID);
+                        ret.Add(new LSL_Key(land.GlobalID.ToString()));
                         break;
                     default:
-                        ret = ret + new LSL_List(0);
+                        ret.Add(new LSL_Integer(0));
                         break;
                 }
             }
@@ -9996,10 +9996,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         switch (o.ToString())
                         {
                             case "1":
-                                ret.Add(av.Firstname + " " + av.Lastname);
+                                ret.Add(new LSL_String(av.Firstname + " " + av.Lastname));
                                 break;
                             case "2":
-                                ret.Add("");
+                                ret.Add(new LSL_String(""));
                                 break;
                             case "3":
                                 ret.Add(new LSL_Vector((double)av.AbsolutePosition.X, (double)av.AbsolutePosition.Y, (double)av.AbsolutePosition.Z));
@@ -10011,13 +10011,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 ret.Add(new LSL_Vector(av.Velocity.X, av.Velocity.Y, av.Velocity.Z));
                                 break;
                             case "6":
-                                ret.Add(id);
+                                ret.Add(new LSL_String(id));
                                 break;
                             case "7":
-                                ret.Add(UUID.Zero.ToString());
+                                ret.Add(new LSL_String(UUID.Zero.ToString()));
                                 break;
                             case "8":
-                                ret.Add(UUID.Zero.ToString());
+                                ret.Add(new LSL_String(UUID.Zero.ToString()));
                                 break;
                         }
                     }
@@ -10031,10 +10031,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         switch (o.ToString())
                         {
                             case "1":
-                                ret.Add(obj.Name);
+                                ret.Add(new LSL_String(obj.Name));
                                 break;
                             case "2":
-                                ret.Add(obj.Description);
+                                ret.Add(new LSL_String(obj.Description));
                                 break;
                             case "3":
                                 ret.Add(new LSL_Vector(obj.AbsolutePosition.X, obj.AbsolutePosition.Y, obj.AbsolutePosition.Z));
@@ -10046,13 +10046,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 ret.Add(new LSL_Vector(obj.Velocity.X, obj.Velocity.Y, obj.Velocity.Z));
                                 break;
                             case "6":
-                                ret.Add(obj.OwnerID.ToString());
+                                ret.Add(new LSL_String(obj.OwnerID.ToString()));
                                 break;
                             case "7":
-                                ret.Add(obj.GroupID.ToString());
+                                ret.Add(new LSL_String(obj.GroupID.ToString()));
                                 break;
                             case "8":
-                                ret.Add(obj.CreatorID.ToString());
+                                ret.Add(new LSL_String(obj.CreatorID.ToString()));
                                 break;
                         }
                     }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 645566e..80daf5b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -130,7 +130,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             int idx = 0;
             while (idx < rules.Length)
             {
-                uint rule = (uint)rules.GetLSLIntegerItem(idx);
+                LSL_Integer ruleInt = rules.GetLSLIntegerItem(idx);
+                uint rule = (uint)ruleInt;
                 LSL_List toadd = new LSL_List();
 
                 switch (rule)
@@ -247,7 +248,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if (toadd.Length > 0)
                 {
-                    values.Add(rule);
+                    values.Add(ruleInt);
                     values.Add(toadd.Data[0]);
                 }
                 idx++;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 64931d0..b710229 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -38,7 +38,6 @@ using OpenSim;
 using OpenSim.Framework;
 
 using OpenSim.Framework.Console;
-using OpenSim.Region.CoreModules.Avatar.NPC;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.ScriptEngine.Shared;
@@ -812,7 +811,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             World.ForEachScenePresence(delegate(ScenePresence sp)
             {
                 if (!sp.IsChildAgent)
-                    result.Add(sp.Name);
+                    result.Add(new LSL_String(sp.Name));
             });
             return result;
         }
@@ -970,7 +969,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public string osDrawPolygon(string drawList, LSL_List x, LSL_List y)
         {
-            CheckThreatLevel(ThreatLevel.None, "osDrawFilledPolygon");
+            CheckThreatLevel(ThreatLevel.None, "osDrawPolygon");
 
             m_host.AddScriptLPS(1);
 
@@ -1241,7 +1240,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return String.Empty;
         }
 
-        public void osSetWindParam(string plugin, string param, float value)
+        public void osSetWindParam(string plugin, string param, LSL_Float value)
         {
             CheckThreatLevel(ThreatLevel.VeryLow, "osSetWindParam");
             m_host.AddScriptLPS(1);
@@ -1251,13 +1250,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 try
                 {
-                    module.WindParamSet(plugin, param, value);
+                    module.WindParamSet(plugin, param, (float)value);
                 }
                 catch (Exception) { }
             }
         }
 
-        public float osGetWindParam(string plugin, string param)
+        public LSL_Float osGetWindParam(string plugin, string param)
         {
             CheckThreatLevel(ThreatLevel.VeryLow, "osGetWindParam");
             m_host.AddScriptLPS(1);
@@ -1409,7 +1408,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             // What actually is the difference to the LL function?
             //
-            CheckThreatLevel(ThreatLevel.VeryLow, "osSetParcelMediaURL");
+            CheckThreatLevel(ThreatLevel.VeryLow, "osSetParcelSIPAddress");
 
             m_host.AddScriptLPS(1);
 
@@ -1910,8 +1909,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             };
 
             return NotecardCache.GetLines(assetID);
-
-
         }
 
         public string osAvatarName2Key(string firstname, string lastname)
@@ -2025,16 +2022,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // Find matches beginning at start position
             Regex matcher = new Regex(pattern);
             Match match = matcher.Match(src, start);
-            if (match.Success)
+            while (match.Success)
             {
                 foreach (System.Text.RegularExpressions.Group g in match.Groups)
                 {
                     if (g.Success)
                     {
-                        result.Add(g.Value);
-                        result.Add(g.Index);
+                        result.Add(new LSL_String(g.Value));
+                        result.Add(new LSL_Integer(g.Index));
                     }
                 }
+
+                match = match.NextMatch();
             }
 
             return result;
@@ -2209,12 +2208,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return (int)pws;
         }
         
-        public void osSetSpeed(string UUID, float SpeedModifier)
+        public void osSetSpeed(string UUID, LSL_Float SpeedModifier)
         {
             CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed");
             m_host.AddScriptLPS(1);
             ScenePresence avatar = World.GetScenePresence(new UUID(UUID));
-            avatar.SpeedModifier = SpeedModifier;
+            avatar.SpeedModifier = (float)SpeedModifier;
         }
         
         public void osKickAvatar(string FirstName,string SurName,string alert)
@@ -2295,14 +2294,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             CheckThreatLevel(ThreatLevel.High, "osGetPrimitiveParams");
             m_host.AddScriptLPS(1);
+            InitLSL();
             
             return m_LSL_Api.GetLinkPrimitiveParamsEx(prim, rules);
         }
 
         public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules)
         {
-            CheckThreatLevel(ThreatLevel.High, "osGetPrimitiveParams");
+            CheckThreatLevel(ThreatLevel.High, "osSetPrimitiveParams");
             m_host.AddScriptLPS(1);
+            InitLSL();
             
             m_LSL_Api.SetPrimitiveParamsEx(prim, rules);
         }
@@ -2364,9 +2365,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 {
                     if (avatar.IsChildAgent == false)
                     {
-                        result.Add(avatar.UUID);
-                        result.Add(avatar.AbsolutePosition);
-                        result.Add(avatar.Name);
+                        result.Add(new LSL_String(avatar.UUID.ToString()));
+                        OpenMetaverse.Vector3 ap = avatar.AbsolutePosition;
+                        result.Add(new LSL_Vector(ap.X, ap.Y, ap.Z));
+                        result.Add(new LSL_String(avatar.Name));
                     }
                 }
             });
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 63007c6..19352f0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -129,8 +129,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 
         // Wind Module Functions
         string osWindActiveModelPluginName();
-        void osSetWindParam(string plugin, string param, float value);
-        float osGetWindParam(string plugin, string param);
+        void osSetWindParam(string plugin, string param, LSL_Float value);
+        LSL_Float osGetWindParam(string plugin, string param);
 
         // Parcel commands
         void osParcelJoin(vector pos1, vector pos2);
@@ -180,7 +180,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
 
         int osGetSimulatorMemory();
         void osKickAvatar(string FirstName,string SurName,string alert);
-        void osSetSpeed(string UUID, float SpeedModifier);
+        void osSetSpeed(string UUID, LSL_Float SpeedModifier);
         void osCauseHealing(string avatar, double healing);
         void osCauseDamage(string avatar, double damage);
         LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index e3ea556..7c59098 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -106,16 +106,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_OSSL_Functions.osWindActiveModelPluginName();
         }
 
-// Not yet plugged in as available OSSL functions, so commented out
-//        void osSetWindParam(string plugin, string param, float value)
-//        {
-//            m_OSSL_Functions.osSetWindParam(plugin, param, value);
-//        }
-//
-//        float osGetWindParam(string plugin, string param)
-//        {
-//            return m_OSSL_Functions.osGetWindParam(plugin, param);
-//        }
+        public void osSetWindParam(string plugin, string param, LSL_Float value)
+        {
+            m_OSSL_Functions.osSetWindParam(plugin, param, value);
+        }
+
+        public LSL_Float osGetWindParam(string plugin, string param)
+        {
+            return m_OSSL_Functions.osGetWindParam(plugin, param);
+        }
 
         public void osParcelJoin(vector pos1, vector pos2)
         {
@@ -714,7 +713,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert);
         }
         
-        public void osSetSpeed(string UUID, float SpeedModifier)
+        public void osSetSpeed(string UUID, LSL_Float SpeedModifier)
         {
             m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier);
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 49d6abe..734d4d5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -106,6 +106,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             // Get some config
             WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", false);
             CompileWithDebugInformation = m_scriptEngine.Config.GetBoolean("CompileWithDebugInformation", true);
+            bool DeleteScriptsOnStartup = m_scriptEngine.Config.GetBoolean("DeleteScriptsOnStartup", true);
 
             // Get file prefix from scriptengine name and make it file system safe:
             FilePrefix = "CommonCompiler";
@@ -114,11 +115,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 FilePrefix = FilePrefix.Replace(c, '_');
             }
 
-            // First time we start? Delete old files
             if (in_startup)
             {
                 in_startup = false;
-                DeleteOldFiles();
+                CreateScriptsDirectory();
+                
+                // First time we start? Delete old files
+                if (DeleteScriptsOnStartup)
+                    DeleteOldFiles();
             }
 
             // Map name and enum type of our supported languages
@@ -187,11 +191,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         }
 
         /// <summary>
-        /// Delete old script files
+        /// Create the directory where compiled scripts are stored.
         /// </summary>
-        private void DeleteOldFiles()
+        private void CreateScriptsDirectory()
         {
-            // CREATE FOLDER IF IT DOESNT EXIST
             if (!Directory.Exists(ScriptEnginesPath))
             {
                 try
@@ -218,7 +221,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                                             m_scriptEngine.World.RegionInfo.RegionID.ToString()) + "\": " + ex.ToString());
                 }
             }
+        }
 
+        /// <summary>
+        /// Delete old script files
+        /// </summary>
+        private void DeleteOldFiles()
+        {
             foreach (string file in Directory.GetFiles(Path.Combine(ScriptEnginesPath,
                      m_scriptEngine.World.RegionInfo.RegionID.ToString()), FilePrefix + "_compiled*"))
             {
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 461b473..d848b2a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -1379,7 +1379,9 @@ namespace OpenSim.Region.ScriptEngine.Shared
         public struct LSLString
         {
             public string m_string;
+
             #region Constructors
+
             public LSLString(string s)
             {
                 m_string = s;
@@ -1387,22 +1389,24 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             public LSLString(double d)
             {
-                string s=String.Format(Culture.FormatProvider, "{0:0.000000}", d);
-                m_string=s;
+                string s = String.Format(Culture.FormatProvider, "{0:0.000000}", d);
+                m_string = s;
             }
 
             public LSLString(LSLFloat f)
             {
                 string s = String.Format(Culture.FormatProvider, "{0:0.000000}", f.value);
-                m_string=s;
+                m_string = s;
             }
-
-            public LSLString(LSLInteger i)
+            
+            public LSLString(int i)
             {
                 string s = String.Format("{0}", i);
                 m_string = s;
             }
 
+            public LSLString(LSLInteger i) : this(i.value) {}
+            
             #endregion
 
             #region Operators
@@ -1469,6 +1473,11 @@ namespace OpenSim.Region.ScriptEngine.Shared
             {
                 return new LSLString(d);
             }
+            
+            static public explicit operator LSLString(int i)
+            {
+                return new LSLString(i);
+            }
 
             public static explicit operator LSLString(LSLFloat f)
             {
@@ -1742,7 +1751,17 @@ namespace OpenSim.Region.ScriptEngine.Shared
             public override bool Equals(Object o)
             {
                 if (!(o is LSLInteger))
-                    return false;
+                {
+                    if (o is int)
+                    {
+                        return value == (int)o;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+                
                 return value == ((LSLInteger)o).value;
             }