diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 4b70ec8c44..4da1b3bc68 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -198,50 +198,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public void osSetRegionWaterHeight(double height)
-        {
-            m_host.AddScriptLPS(1);
-            //Check to make sure that the script's owner is the estate manager/master
-            //World.Permissions.GenericEstatePermission(
-            if (World.ExternalChecks.ExternalChecksCanBeGodLike(m_host.OwnerID))
-            {
-                World.EventManager.TriggerRequestChangeWaterHeight((float)height);
-            }
-        }
-
         //These are the implementations of the various ll-functions used by the LSL scripts.
         //starting out, we use the System.Math library for trig functions. - ckrinke 8-14-07
-        public double llSin(double f)
+        public LSL_Types.LSLFloat llSin(double f)
         {
             m_host.AddScriptLPS(1);
             return (double)Math.Sin(f);
         }
 
-        public double llCos(double f)
+        public LSL_Types.LSLFloat llCos(double f)
         {
             m_host.AddScriptLPS(1);
             return (double)Math.Cos(f);
         }
 
-        public double llTan(double f)
+        public LSL_Types.LSLFloat llTan(double f)
         {
             m_host.AddScriptLPS(1);
             return (double)Math.Tan(f);
         }
 
-        public double llAtan2(double x, double y)
+        public LSL_Types.LSLFloat llAtan2(double x, double y)
         {
             m_host.AddScriptLPS(1);
             return (double)Math.Atan2(y, x);
         }
 
-        public double llSqrt(double f)
+        public LSL_Types.LSLFloat llSqrt(double f)
         {
             m_host.AddScriptLPS(1);
             return (double)Math.Sqrt(f);
         }
 
-        public double llPow(double fbase, double fexponent)
+        public LSL_Types.LSLFloat llPow(double fbase, double fexponent)
         {
             m_host.AddScriptLPS(1);
             return (double)Math.Pow(fbase, fexponent);
@@ -253,13 +242,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return (int)Math.Abs(i);
         }
 
-        public double llFabs(double f)
+        public LSL_Types.LSLFloat llFabs(double f)
         {
             m_host.AddScriptLPS(1);
             return (double)Math.Abs(f);
         }
 
-        public double llFrand(double mag)
+        public LSL_Types.LSLFloat llFrand(double mag)
         {
             m_host.AddScriptLPS(1);
             lock (Util.RandomClass)
@@ -288,7 +277,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         }
 
         //This next group are vector operations involving squaring and square root. ckrinke
-        public double llVecMag(LSL_Types.Vector3 v)
+        public LSL_Types.LSLFloat llVecMag(LSL_Types.Vector3 v)
         {
             m_host.AddScriptLPS(1);
             return LSL_Types.Vector3.Mag(v);
@@ -305,7 +294,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return nor;
         }
 
-        public double llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b)
+        public LSL_Types.LSLFloat llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b)
         {
             m_host.AddScriptLPS(1);
             double dx = a.x - b.x;
@@ -677,7 +666,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return SensedObject.Name;
         }
 
-        public string llDetectedName(int number)
+        public LSL_Types.LSLString llDetectedName(int number)
         {
             m_host.AddScriptLPS(1);
             DetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number);
@@ -686,7 +675,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return d.Name;
         }
 
-        public string llDetectedKey(int number)
+        public LSL_Types.LSLString llDetectedKey(int number)
         {
             m_host.AddScriptLPS(1);
             DetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number);
@@ -695,7 +684,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return d.Key.ToString();
         }
 
-        public string llDetectedOwner(int number)
+        public LSL_Types.LSLString llDetectedOwner(int number)
         {
             m_host.AddScriptLPS(1);
             DetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number);
@@ -777,7 +766,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             throw new SelfDeleteException();
         }
 
-        public double llGround(LSL_Types.Vector3 offset)
+        public LSL_Types.LSLFloat llGround(LSL_Types.Vector3 offset)
         {
             m_host.AddScriptLPS(1);
             int x = (int)(m_host.AbsolutePosition.X + offset.x);
@@ -785,7 +774,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return World.GetLandHeight(x, y);
         }
 
-        public double llCloud(LSL_Types.Vector3 offset)
+        public LSL_Types.LSLFloat llCloud(LSL_Types.Vector3 offset)
         {
             m_host.AddScriptLPS(1);
             return 0;
@@ -1131,7 +1120,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
              }
          }
 
-        public double llGetAlpha(int face)
+        public LSL_Types.LSLFloat llGetAlpha(int face)
         {
             m_host.AddScriptLPS(1);
             Primitive.TextureEntry tex = m_host.Shape.Textures;
@@ -1458,7 +1447,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public string llGetTexture(int face)
+        public LSL_Types.LSLString llGetTexture(int face)
         {
             m_host.AddScriptLPS(1);
             Primitive.TextureEntry tex = m_host.Shape.Textures;
@@ -1695,19 +1684,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return new LSL_Types.Vector3(m_host.RotationalVelocity.X, m_host.RotationalVelocity.Y, m_host.RotationalVelocity.Z);
         }
 
-        public double llGetTimeOfDay()
+        public LSL_Types.LSLFloat llGetTimeOfDay()
         {
             m_host.AddScriptLPS(1);
             return (double)(((DateTime.Now.TimeOfDay.TotalMilliseconds / 1000) % (3600 * 4)) * World.TimeDilation);
         }
 
-        public double llGetWallclock()
+        public LSL_Types.LSLFloat llGetWallclock()
         {
             m_host.AddScriptLPS(1);
             return DateTime.Now.TimeOfDay.TotalSeconds;
         }
 
-        public double llGetTime()
+        public LSL_Types.LSLFloat llGetTime()
         {
             m_host.AddScriptLPS(1);
             TimeSpan ScriptTime = DateTime.Now - m_timer;
@@ -1720,7 +1709,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_timer = DateTime.Now;
         }
 
-        public double llGetAndResetTime()
+        public LSL_Types.LSLFloat llGetAndResetTime()
         {
             m_host.AddScriptLPS(1);
             TimeSpan ScriptTime = DateTime.Now - m_timer;
@@ -1825,7 +1814,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// this more complicated than it might otherwise seem.
         /// </summary>
 
-        public string llGetSubString(string src, int start, int end)
+        public LSL_Types.LSLString llGetSubString(string src, int start, int end)
         {
 
             m_host.AddScriptLPS(1);
@@ -1921,7 +1910,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// i.e. end < start.
         /// </summary>
 
-        public string llDeleteSubString(string src, int start, int end)
+        public LSL_Types.LSLString llDeleteSubString(string src, int start, int end)
         {
 
             m_host.AddScriptLPS(1);
@@ -2004,7 +1993,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// string bound, with the result being a concatenation.
         /// </summary>
 
-        public string llInsertString(string dest, int index, string src)
+        public LSL_Types.LSLString llInsertString(string dest, int index, string src)
         {
 
             m_host.AddScriptLPS(1);
@@ -2042,13 +2031,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         }
 
-        public string llToUpper(string src)
+        public LSL_Types.LSLString llToUpper(string src)
         {
             m_host.AddScriptLPS(1);
             return src.ToUpper();
         }
 
-        public string llToLower(string src)
+        public LSL_Types.LSLString llToLower(string src)
         {
             m_host.AddScriptLPS(1);
             return src.ToLower();
@@ -2221,7 +2210,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             Thread.Sleep((int)(sec * 1000));
         }
 
-        public double llGetMass()
+        public LSL_Types.LSLFloat llGetMass()
         {
             m_host.AddScriptLPS(1);
             return m_host.GetMass();
@@ -2308,7 +2297,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             Deprecated("llReleaseCamera");
         }
 
-        public string llGetOwner()
+        public LSL_Types.LSLString llGetOwner()
         {
             m_host.AddScriptLPS(1);
 
@@ -2398,7 +2387,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         }
 
-        public string llGetKey()
+        public LSL_Types.LSLString llGetKey()
         {
             m_host.AddScriptLPS(1);
             return m_host.UUID.ToString();
@@ -2673,7 +2662,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     new DetectParams[0]));
         }
 
-        public string llGetPermissionsKey()
+        public LSL_Types.LSLString llGetPermissionsKey()
         {
             m_host.AddScriptLPS(1);
 
@@ -2857,7 +2846,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             NotImplemented("llBreakAllLinks");
         }
 
-        public string llGetLinkKey(int linknum)
+        public LSL_Types.LSLString llGetLinkKey(int linknum)
         {
             m_host.AddScriptLPS(1);
             SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum);
@@ -2871,7 +2860,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public string llGetLinkName(int linknum)
+        public LSL_Types.LSLString llGetLinkName(int linknum)
         {
             m_host.AddScriptLPS(1);
             SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum);
@@ -2899,7 +2888,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return count;
         }
 
-        public string llGetInventoryName(int type, int number)
+        public LSL_Types.LSLString llGetInventoryName(int type, int number)
         {
             m_host.AddScriptLPS(1);
             ArrayList keys = new ArrayList();
@@ -2941,7 +2930,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public double llGetEnergy()
+        public LSL_Types.LSLFloat llGetEnergy()
         {
             m_host.AddScriptLPS(1);
             // TODO: figure out real energy value
@@ -3013,7 +3002,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.ParentGroup.HasGroupChanged = true;
         }
 
-        public double llWater(LSL_Types.Vector3 offset)
+        public LSL_Types.LSLFloat llWater(LSL_Types.Vector3 offset)
         {
             m_host.AddScriptLPS(1);
             return World.RegionInfo.RegionSettings.WaterHeight;
@@ -3025,7 +3014,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             NotImplemented("llPassTouches");
         }
 
-        public string llRequestAgentData(string id, int data)
+        public LSL_Types.LSLString llRequestAgentData(string id, int data)
         {
             m_host.AddScriptLPS(1);
 
@@ -3080,7 +3069,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return tid.ToString();
         }
 
-        public string llRequestInventoryData(string name)
+        public LSL_Types.LSLString llRequestInventoryData(string name)
         {
             m_host.AddScriptLPS(1);
 
@@ -3161,7 +3150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             NotImplemented("llCollisionSprite");
         }
 
-        public string llGetAnimation(string id)
+        public LSL_Types.LSLString llGetAnimation(string id)
         {
             m_host.AddScriptLPS(1);
             NotImplemented("llGetAnimation");
@@ -3365,7 +3354,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             NotImplemented("llPassCollisions");
         }
 
-        public string llGetScriptName()
+        public LSL_Types.LSLString llGetScriptName()
         {
 
             string result = String.Empty;
@@ -3589,7 +3578,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
 
         // Returns the angle of a quaternion (see llRot2Axis for the axis)
-        public double llRot2Angle(LSL_Types.Quaternion rot)
+        public LSL_Types.LSLFloat llRot2Angle(LSL_Types.Quaternion rot)
         {
             m_host.AddScriptLPS(1);
 
@@ -3612,27 +3601,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 //            NotImplemented("llRot2Angle");
         }
 
-        public double llAcos(double val)
+        public LSL_Types.LSLFloat llAcos(double val)
         {
             m_host.AddScriptLPS(1);
             return (double)Math.Acos(val);
         }
 
-        public double llAsin(double val)
+        public LSL_Types.LSLFloat llAsin(double val)
         {
             m_host.AddScriptLPS(1);
             return (double)Math.Asin(val);
         }
 
         // Xantor 30/apr/2008
-        public double llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b)
+        public LSL_Types.LSLFloat llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b)
         {
             m_host.AddScriptLPS(1);
 
            return (double) Math.Acos(a.x * b.x + a.y * b.y + a.z * b.z + a.s * b.s) * 2;
         }
 
-        public string llGetInventoryKey(string name)
+        public LSL_Types.LSLString llGetInventoryKey(string name)
         {
             m_host.AddScriptLPS(1);
             foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
@@ -3709,7 +3698,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return scale;
         }
 
-        public double llGetTextureRot(int face)
+        public LSL_Types.LSLFloat llGetTextureRot(int face)
         {
             m_host.AddScriptLPS(1);
             Primitive.TextureEntry tex = m_host.Shape.Textures;
@@ -3726,7 +3715,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return source.IndexOf(pattern);
         }
 
-        public string llGetOwnerKey(string id)
+        public LSL_Types.LSLString llGetOwnerKey(string id)
         {
             m_host.AddScriptLPS(1);
             UUID key = new UUID();
@@ -3799,27 +3788,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public double osList2Double(LSL_Types.list src, int index)
-        {
-            m_host.AddScriptLPS(1);
-            if (index < 0)
-            {
-                index = src.Length + index;
-            }
-            if (index >= src.Length)
-            {
-                return 0.0;
-            }
-            if (src.Data[index] is LSL_Types.LSLInteger)
-                return Convert.ToDouble(((LSL_Types.LSLInteger) src.Data[index]).value);
-            else if (src.Data[index] is LSL_Types.LSLFloat)
-                return Convert.ToDouble(((LSL_Types.LSLFloat) src.Data[index]).value);
-            else if (src.Data[index] is LSL_Types.LSLString)
-                return Convert.ToDouble(((LSL_Types.LSLString) src.Data[index]).m_string);
-            return Convert.ToDouble(src.Data[index]);
-        }
-
-        public double llList2Float(LSL_Types.list src, int index)
+        public LSL_Types.LSLFloat llList2Float(LSL_Types.list src, int index)
         {
             m_host.AddScriptLPS(1);
             if (index < 0)
@@ -3846,7 +3815,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public string llList2String(LSL_Types.list src, int index)
+        public LSL_Types.LSLString llList2String(LSL_Types.list src, int index)
         {
             m_host.AddScriptLPS(1);
             if (index < 0)
@@ -3860,7 +3829,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return src.Data[index].ToString();
         }
 
-        public string llList2Key(LSL_Types.list src, int index)
+        public LSL_Types.LSLString llList2Key(LSL_Types.list src, int index)
         {
             m_host.AddScriptLPS(1);
             if (index < 0)
@@ -3972,7 +3941,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// each comma.
         /// </summary>
 
-        public string llList2CSV(LSL_Types.list src)
+        public LSL_Types.LSLString llList2CSV(LSL_Types.list src)
         {
 
             string ret = String.Empty;
@@ -4302,7 +4271,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         }
 
-        public string llGetObjectName()
+        public LSL_Types.LSLString llGetObjectName()
         {
             m_host.AddScriptLPS(1);
             return m_host.Name!=null?m_host.Name:String.Empty;
@@ -4314,7 +4283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.Name = name!=null?name:String.Empty;
         }
 
-        public string llGetDate()
+        public LSL_Types.LSLString llGetDate()
         {
             m_host.AddScriptLPS(1);
             DateTime date = DateTime.Now.ToUniversalTime();
@@ -4355,7 +4324,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.SoundRadius = radius;
         }
 
-        public string llKey2Name(string id)
+        public LSL_Types.LSLString llKey2Name(string id)
         {
             m_host.AddScriptLPS(1);
             UUID key = new UUID();
@@ -4504,7 +4473,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return 0;
         }
 
-        public string llGetLandOwnerAt(LSL_Types.Vector3 pos)
+        public LSL_Types.LSLString llGetLandOwnerAt(LSL_Types.Vector3 pos)
         {
             m_host.AddScriptLPS(1);
             return World.GetLandOwner((float)pos.x, (float)pos.y).ToString();
@@ -4632,19 +4601,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return 0;
         }
 
-        public string llGetRegionName()
+        public LSL_Types.LSLString llGetRegionName()
         {
             m_host.AddScriptLPS(1);
             return World.RegionInfo.RegionName;
         }
 
-        public double llGetRegionTimeDilation()
+        public LSL_Types.LSLFloat llGetRegionTimeDilation()
         {
             m_host.AddScriptLPS(1);
             return (double)World.TimeDilation;
         }
 
-        public double llGetRegionFPS()
+        public LSL_Types.LSLFloat llGetRegionFPS()
         {
             m_host.AddScriptLPS(1);
             //TODO: return actual FPS
@@ -4959,7 +4928,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.SitTargetOrientation = new Quaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s);
         }
 
-        public string llAvatarOnSitTarget()
+        public LSL_Types.LSLString llAvatarOnSitTarget()
         {
             m_host.AddScriptLPS(1);
             return m_host.GetAvatarOnSitTarget().ToString();
@@ -5008,7 +4977,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.SetCameraAtOffset(new Vector3((float)offset.x, (float)offset.y, (float)offset.z));
         }
 
-        public string llDumpList2String(LSL_Types.list src, string seperator)
+        public LSL_Types.LSLString llDumpList2String(LSL_Types.list src, string seperator)
         {
             m_host.AddScriptLPS(1);
             if (src.Length == 0)
@@ -5188,7 +5157,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // ScriptSleep(1000);
         }
 
-        public string llSendRemoteData(string channel, string dest, int idata, string sdata)
+        public LSL_Types.LSLString llSendRemoteData(string channel, string dest, int idata, string sdata)
         {
             m_host.AddScriptLPS(1);
             IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
@@ -5212,7 +5181,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // ScriptSleep(1000);
         }
 
-        public string llMD5String(string src, int nonce)
+        public LSL_Types.LSLString llMD5String(string src, int nonce)
         {
             m_host.AddScriptLPS(1);
             return Util.Md5Hash(src + ":" + nonce.ToString());
@@ -5866,7 +5835,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public string llStringToBase64(string str)
+        public LSL_Types.LSLString llStringToBase64(string str)
         {
             m_host.AddScriptLPS(1);
             try
@@ -5882,7 +5851,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public string llBase64ToString(string str)
+        public LSL_Types.LSLString llBase64ToString(string str)
         {
             m_host.AddScriptLPS(1);
             UTF8Encoding encoder = new UTF8Encoding();
@@ -5915,13 +5884,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             NotImplemented("llRemoteDataSetRegion");
         }
 
-        public double llLog10(double val)
+        public LSL_Types.LSLFloat llLog10(double val)
         {
             m_host.AddScriptLPS(1);
             return (double)Math.Log10(val);
         }
 
-        public double llLog(double val)
+        public LSL_Types.LSLFloat llLog(double val)
         {
             m_host.AddScriptLPS(1);
             return (double)Math.Log(val);
@@ -5958,24 +5927,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // ScriptSleep(2000);
         }
 
-        public void osSetParcelMediaURL(string url)
-        {
-            m_host.AddScriptLPS(1);
-            UUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
-
-            if (landowner == UUID.Zero)
-            {
-                return;
-            }
-
-            if (landowner != m_host.ObjectOwner)
-            {
-                return;
-            }
-
-            World.SetLandMediaURL(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, url);
-        }
-
         public LSL_Types.Vector3 llGetRootPosition()
         {
             m_host.AddScriptLPS(1);
@@ -5988,7 +5939,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return new LSL_Types.Quaternion(m_host.ParentGroup.GroupRotation.X, m_host.ParentGroup.GroupRotation.Y, m_host.ParentGroup.GroupRotation.Z, m_host.ParentGroup.GroupRotation.W);
         }
 
-        public string llGetObjectDesc()
+        public LSL_Types.LSLString llGetObjectDesc()
         {
             return m_host.Description!=null?m_host.Description:String.Empty;
         }
@@ -5999,13 +5950,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.Description = desc!=null?desc:String.Empty;
         }
 
-        public string llGetCreator()
+        public LSL_Types.LSLString llGetCreator()
         {
             m_host.AddScriptLPS(1);
             return m_host.ObjectCreator.ToString();
         }
 
-        public string llGetTimestamp()
+        public LSL_Types.LSLString llGetTimestamp()
         {
             m_host.AddScriptLPS(1);
             return DateTime.Now.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffZ");
@@ -6480,7 +6431,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         //  characters are padded with "=".
         //  </returns>
 
-        public string llIntegerToBase64(int number)
+        public LSL_Types.LSLString llIntegerToBase64(int number)
         {
             // uninitialized string
 
@@ -6603,13 +6554,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return number;
         }
 
-        public double llGetGMTclock()
+        public LSL_Types.LSLFloat llGetGMTclock()
         {
             m_host.AddScriptLPS(1);
             return DateTime.UtcNow.TimeOfDay.TotalSeconds;
         }
 
-        public string llGetSimulatorHostname()
+        public LSL_Types.LSLString llGetSimulatorHostname()
         {
             m_host.AddScriptLPS(1);
             return System.Environment.MachineName;
@@ -6902,7 +6853,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             NotImplemented("llSetInventoryPermMask");
         }
 
-        public string llGetInventoryCreator(string item)
+        public LSL_Types.LSLString llGetInventoryCreator(string item)
         {
             m_host.AddScriptLPS(1);
             foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
@@ -6925,7 +6876,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 //            wComm.DeliverMessage(ChatTypeEnum.Owner, 0, m_host.Name, m_host.UUID, msg);
         }
 
-        public string llRequestSimulatorData(string simulator, int data)
+        public LSL_Types.LSLString llRequestSimulatorData(string simulator, int data)
         {
             try
             {
@@ -6999,7 +6950,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.SetForceMouselook(mouselook != 0);
         }
 
-        public double llGetObjectMass(string id)
+        public LSL_Types.LSLFloat llGetObjectMass(string id)
         {
             m_host.AddScriptLPS(1);
             UUID key = new UUID();
@@ -7159,8 +7110,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         {
                             if (commandList.Data[i + 1] is string)
                             {
-                                //Set the new media URL only if the user is the owner of the land
-                                osSetParcelMediaURL(commandList.Data[i + 1].ToString());
+                                UUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
+
+                                if (landowner == UUID.Zero)
+                                {
+                                    return;
+                                }
+
+                                if (landowner != m_host.ObjectOwner)
+                                {
+                                    return;
+                                }
+
+                                World.SetLandMediaURL(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, (string)commandList.GetLSLStringItem(i + 1));
 
                                 List<ScenePresence> scenePresenceList = World.GetScenePresences();
                                 LandData landData = World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
@@ -7312,7 +7274,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // ScriptSleep(20000);
         }
 
-        public string llEscapeURL(string url)
+        public LSL_Types.LSLString llEscapeURL(string url)
         {
             m_host.AddScriptLPS(1);
             try
@@ -7325,7 +7287,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public string llUnescapeURL(string url)
+        public LSL_Types.LSLString llUnescapeURL(string url)
         {
             m_host.AddScriptLPS(1);
             try
@@ -7484,7 +7446,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             presence.ControllingClient.SendClearFollowCamProperties(objectID);
         }
 
-        public double llListStatistics(int operation, LSL_Types.list src)
+        public LSL_Types.LSLFloat llListStatistics(int operation, LSL_Types.list src)
         {
             m_host.AddScriptLPS(1);
             LSL_Types.list nums = LSL_Types.list.ToDoubleList(src);
@@ -7538,7 +7500,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return (int)estate.GetRegionFlags();
         }
 
-        public string llXorBase64StringsCorrect(string str1, string str2)
+        public LSL_Types.LSLString llXorBase64StringsCorrect(string str1, string str2)
         {
             m_host.AddScriptLPS(1);
             string ret = String.Empty;
@@ -7556,7 +7518,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return llStringToBase64(ret);
         }
 
-        public string llHTTPRequest(string url, LSL_Types.list parameters, string body)
+        public LSL_Types.LSLString llHTTPRequest(string url, LSL_Types.list parameters, string body)
         {
             // Partial implementation: support for parameter flags needed
             //   see http://wiki.secondlife.com/wiki/LlHTTPRequest
@@ -7809,7 +7771,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // ScriptSleep(200);
         }
 
-        public string llStringTrim(string src, int type)
+        public LSL_Types.LSLString llStringTrim(string src, int type)
         {
             m_host.AddScriptLPS(1);
             if (type == (int)ScriptBaseClass.STRING_TRIM_HEAD) { return src.TrimStart(); }
@@ -7940,7 +7902,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             World.AssetCache.GetAsset(assetID, delegate(UUID i, AssetBase a) { cb(i, a); }, false);
         }
 
-        public string llGetNumberOfNotecardLines(string name)
+        public LSL_Types.LSLString llGetNumberOfNotecardLines(string name)
         {
             m_host.AddScriptLPS(1);
 
@@ -7978,7 +7940,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return UUID.Zero.ToString();
         }
 
-        public string llGetNotecardLine(string name, int line)
+        public LSL_Types.LSLString llGetNotecardLine(string name, int line)
         {
             m_host.AddScriptLPS(1);
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 61556a981c..785bfd0753 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -36,21 +36,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
     {
         void state(string newState);
         void llSay(int channelID, string text);
-        double llSin(double f);
-        double llCos(double f);
-        double llTan(double f);
-        double llAtan2(double x, double y);
-        double llSqrt(double f);
-        double llPow(double fbase, double fexponent);
+        LSL_Types.LSLFloat llSin(double f);
+        LSL_Types.LSLFloat llCos(double f);
+        LSL_Types.LSLFloat llTan(double f);
+        LSL_Types.LSLFloat llAtan2(double x, double y);
+        LSL_Types.LSLFloat llSqrt(double f);
+        LSL_Types.LSLFloat llPow(double fbase, double fexponent);
         LSL_Types.LSLInteger llAbs(int i);
-        double llFabs(double f);
-        double llFrand(double mag);
+        LSL_Types.LSLFloat llFabs(double f);
+        LSL_Types.LSLFloat llFrand(double mag);
         LSL_Types.LSLInteger llFloor(double f);
         LSL_Types.LSLInteger llCeil(double f);
         LSL_Types.LSLInteger llRound(double f);
-        double llVecMag(LSL_Types.Vector3 v);
+        LSL_Types.LSLFloat llVecMag(LSL_Types.Vector3 v);
         LSL_Types.Vector3 llVecNorm(LSL_Types.Vector3 v);
-        double llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b);
+        LSL_Types.LSLFloat llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b);
         LSL_Types.Vector3 llRot2Euler(LSL_Types.Quaternion r);
         LSL_Types.Quaternion llEuler2Rot(LSL_Types.Vector3 v);
         LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up);
@@ -68,9 +68,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void llSensor(string name, string id, int type, double range, double arc);
         void llSensorRepeat(string name, string id, int type, double range, double arc, double rate);
         void llSensorRemove();
-        string llDetectedName(int number);
-        string llDetectedKey(int number);
-        string llDetectedOwner(int number);
+        LSL_Types.LSLString llDetectedName(int number);
+        LSL_Types.LSLString llDetectedKey(int number);
+        LSL_Types.LSLString llDetectedOwner(int number);
         LSL_Types.LSLInteger llDetectedType(int number);
         LSL_Types.Vector3 llDetectedPos(int number);
         LSL_Types.Vector3 llDetectedVel(int number);
@@ -79,22 +79,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Types.LSLInteger llDetectedGroup(int number);
         LSL_Types.LSLInteger llDetectedLinkNumber(int number);
         void llDie();
-        double llGround(LSL_Types.Vector3 offset);
-        double llCloud(LSL_Types.Vector3 offset);
+        LSL_Types.LSLFloat llGround(LSL_Types.Vector3 offset);
+        LSL_Types.LSLFloat llCloud(LSL_Types.Vector3 offset);
         LSL_Types.Vector3 llWind(LSL_Types.Vector3 offset);
         void llSetStatus(int status, int value);
         LSL_Types.LSLInteger llGetStatus(int status);
         void llSetScale(LSL_Types.Vector3 scale);
         LSL_Types.Vector3 llGetScale();
         void llSetColor(LSL_Types.Vector3 color, int face);
-        double llGetAlpha(int face);
+        LSL_Types.LSLFloat llGetAlpha(int face);
         void llSetAlpha(double alpha, int face);
         LSL_Types.Vector3 llGetColor(int face);
         void llSetTexture(string texture, int face);
         void llScaleTexture(double u, double v, int face);
         void llOffsetTexture(double u, double v, int face);
         void llRotateTexture(double rotation, int face);
-        string llGetTexture(int face);
+        LSL_Types.LSLString llGetTexture(int face);
         void llSetPos(LSL_Types.Vector3 pos);
 
         //wiki: vector llGetPos()
@@ -139,16 +139,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Types.Vector3 llGetAccel();
         //wiki: vector llGetOmega()
         LSL_Types.Vector3 llGetOmega();
-        //wiki: double llGetTimeOfDay()
-        double llGetTimeOfDay();
-        //wiki: double llGetWallclock()
-        double llGetWallclock();
-        //wiki: double llGetTime()
-        double llGetTime();
+        //wiki: LSL_Types.LSLFloat llGetTimeOfDay()
+        LSL_Types.LSLFloat llGetTimeOfDay();
+        //wiki: LSL_Types.LSLFloat llGetWallclock()
+        LSL_Types.LSLFloat llGetWallclock();
+        //wiki: LSL_Types.LSLFloat llGetTime()
+        LSL_Types.LSLFloat llGetTime();
         //wiki: llResetTime()
         void llResetTime();
-        //wiki: double llGetAndResetTime()
-        double llGetAndResetTime();
+        //wiki: LSL_Types.LSLFloat llGetAndResetTime()
+        LSL_Types.LSLFloat llGetAndResetTime();
         //wiki (deprecated) llSound(string sound, double volume, integer queue, integer loop)
         void llSound();
         //wiki: llPlaySound(string sound, double volume)
@@ -167,16 +167,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void llStopSound();
         //wiki: llPreloadSound(string sound)
         void llPreloadSound(string sound);
-        //wiki: string llGetSubString(string src, integer start, integer end)
-        string llGetSubString(string src, int start, int end);
-        //wiki: string llDeleteSubString(string src, integer start, integer end)
-        string llDeleteSubString(string src, int start, int end);
-        //wiki string llInsertString(string dst, integer position, string src)
-        string llInsertString(string dst, int position, string src);
-        //wiki: string llToUpper(string source)
-        string llToUpper(string source);
-        //wiki: string llToLower(string source)
-        string llToLower(string source);
+        //wiki: LSL_Types.LSLString llGetSubString(string src, integer start, integer end)
+        LSL_Types.LSLString llGetSubString(string src, int start, int end);
+        //wiki: LSL_Types.LSLString llDeleteSubString(string src, integer start, integer end)
+        LSL_Types.LSLString llDeleteSubString(string src, int start, int end);
+        //wiki LSL_Types.LSLString llInsertString(string dst, integer position, string src)
+        LSL_Types.LSLString llInsertString(string dst, int position, string src);
+        //wiki: LSL_Types.LSLString llToUpper(string source)
+        LSL_Types.LSLString llToUpper(string source);
+        //wiki: LSL_Types.LSLString llToLower(string source)
+        LSL_Types.LSLString llToLower(string source);
         //wiki: integer llGiveMoney(key destination, integer amount)
         LSL_Types.LSLInteger llGiveMoney(string destination, int amount);
         //wiki: (deprecated)
@@ -197,8 +197,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void llSetTimerEvent(double sec);
         //wiki: llSleep(double sec)
         void llSleep(double sec);
-        //wiki: double llGetMass()
-        double llGetMass();
+        //wiki: LSL_Types.LSLFloat llGetMass()
+        LSL_Types.LSLFloat llGetMass();
         //wiki: llCollisionFilter(string name, key id, integer accept)
         void llCollisionFilter(string name, string id, int accept);
         //wiki: llTakeControls(integer controls, integer accept, integer pass_on)
@@ -214,7 +214,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         //wiki: (deprecated) llReleaseCamera(key avatar)
         void llReleaseCamera(string avatar);
         //wiki: key llGetOwner()
-        string llGetOwner();
+        LSL_Types.LSLString llGetOwner();
         //wiki: llInstantMessage(key user, string message)
         void llInstantMessage(string user, string message);
         //wiki: llEmail(string address, string subject, string message)
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         //wiki: llGetNextEmail(string address, string subject)
         void llGetNextEmail(string address, string subject);
         //wiki:    key llGetKey()
-        string llGetKey();
+        LSL_Types.LSLString llGetKey();
         //wiki: llSetBuoyancy(double buoyancy)
         void llSetBuoyancy(double buoyancy);
         //wiki: llSetHoverHeight(double height, integer water, double tau)
@@ -254,7 +254,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         //wiki: llRequestPermissions(key agent, integer perm)
         void llRequestPermissions(string agent, int perm);
         //wiki: key llGetPermissionsKey()
-        string llGetPermissionsKey();
+        LSL_Types.LSLString llGetPermissionsKey();
         //wiki: integer llGetPermissions()
         LSL_Types.LSLInteger llGetPermissions();
         //wiki integer llGetLinkNumber()
@@ -268,31 +268,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         //wiki: llBreakAllLinks()
         void llBreakAllLinks();
         //wiki: key llGetLinkKey(integer linknum)
-        string llGetLinkKey(int linknum);
+        LSL_Types.LSLString llGetLinkKey(int linknum);
         //wiki: llGetLinkName(integer linknum)
-        string llGetLinkName(int linknum);
+        LSL_Types.LSLString llGetLinkName(int linknum);
         //wiki: integer llGetInventoryNumber(integer type)
         LSL_Types.LSLInteger llGetInventoryNumber(int type);
-        //wiki: string llGetInventoryName(integer type, integer number)
-        string llGetInventoryName(int type, int number);
+        //wiki: LSL_Types.LSLString llGetInventoryName(integer type, integer number)
+        LSL_Types.LSLString llGetInventoryName(int type, int number);
         //wiki: llSetScriptState(string name, integer run)
         void llSetScriptState(string name, int run);
-        //wiki: double llGetEnergy()
-        double llGetEnergy();
+        //wiki: LSL_Types.LSLFloat llGetEnergy()
+        LSL_Types.LSLFloat llGetEnergy();
         //wiki: llGiveInventory(key destination, string inventory)
         void llGiveInventory(string destination, string inventory);
         //wiki: llRemoveInventory(string item)
         void llRemoveInventory(string item);
         //wiki: llSetText(string text, vector color, double alpha)
         void llSetText(string text, LSL_Types.Vector3 color, double alpha);
-        //wiki: double llWater(vector offset)
-        double llWater(LSL_Types.Vector3 offset);
+        //wiki: LSL_Types.LSLFloat llWater(vector offset)
+        LSL_Types.LSLFloat llWater(LSL_Types.Vector3 offset);
         //wiki: llPassTouches(integer pass)
         void llPassTouches(int pass);
         //wiki: key llRequestAgentData(key id, integer data)
-        string llRequestAgentData(string id, int data);
+        LSL_Types.LSLString llRequestAgentData(string id, int data);
         //wiki: key llRequestInventoryData(string name)
-        string llRequestInventoryData(string name);
+        LSL_Types.LSLString llRequestInventoryData(string name);
         //wiki: llSetDamage(double damage)
         void llSetDamage(double damage);
         //wiki: llTeleportAgentHome(key agent)
@@ -303,8 +303,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void llCollisionSound(string impact_sound, double impact_volume);
         //wiki: llCollisionSprite(string impact_sprite)
         void llCollisionSprite(string impact_sprite);
-        //wiki: string llGetAnimation(key id)
-        string llGetAnimation(string id);
+        //wiki: LSL_Types.LSLString llGetAnimation(key id)
+        LSL_Types.LSLString llGetAnimation(string id);
         //wiki: llResetScript()
         void llResetScript();
         //wiki: llMessageLinked(integer linknum, integer num, string str, key id)
@@ -313,24 +313,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local);
         //wiki: llPassCollisions(integer pass)
         void llPassCollisions(int pass);
-        //wiki: string llGetScriptName()
-        string llGetScriptName();
+        //wiki: LSL_Types.LSLString llGetScriptName()
+        LSL_Types.LSLString llGetScriptName();
         //wiki: integer llGetNumberOfSides()
         LSL_Types.LSLInteger llGetNumberOfSides();
         //wiki: rotation llAxisAngle2Rot(vector axis, double angle)
         LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle);
         //wiki: vector llRot2Axis(rotation rot)
         LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot);
-        //wiki: double llRot2Angle(rotation rot);
-        double llRot2Angle(LSL_Types.Quaternion rot);
-        //wiki: double llAcos(double val)
-        double llAcos(double val);
-        //wiki: double llAsin(double val)
-        double llAsin(double val);
-        //wiki: double llAngleBetween(rotation a, rotation b)
-        double llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b);
-        //wiki: string llGetInventoryKey(string name)
-        string llGetInventoryKey(string name);
+        //wiki: LSL_Types.LSLFloat llRot2Angle(rotation rot);
+        LSL_Types.LSLFloat llRot2Angle(LSL_Types.Quaternion rot);
+        //wiki: LSL_Types.LSLFloat llAcos(double val)
+        LSL_Types.LSLFloat llAcos(double val);
+        //wiki: LSL_Types.LSLFloat llAsin(double val)
+        LSL_Types.LSLFloat llAsin(double val);
+        //wiki: LSL_Types.LSLFloat llAngleBetween(rotation a, rotation b)
+        LSL_Types.LSLFloat llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b);
+        //wiki: LSL_Types.LSLString llGetInventoryKey(string name)
+        LSL_Types.LSLString llGetInventoryKey(string name);
         //wiki: llAllowInventoryDrop(integer add)
         void llAllowInventoryDrop(int add);
         //wiki: vector llGetSunDirection()
@@ -339,12 +339,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Types.Vector3 llGetTextureOffset(int face);
         //wiki: vector llGetTextureScale(integer side)
         LSL_Types.Vector3 llGetTextureScale(int side);
-        //wiki: double llGetTextureRot(integer side)
-        double llGetTextureRot(int side);
+        //wiki: LSL_Types.LSLFloat llGetTextureRot(integer side)
+        LSL_Types.LSLFloat llGetTextureRot(int side);
         //wiki: integer llSubStringIndex(string source, string pattern)
         LSL_Types.LSLInteger llSubStringIndex(string source, string pattern);
         //wiki: key llGetOwnerKey(key id)
-        string llGetOwnerKey(string id);
+        LSL_Types.LSLString llGetOwnerKey(string id);
         //wiki: vector llGetCenterOfMass()
         LSL_Types.Vector3 llGetCenterOfMass();
         //wiki: list llListSort(list src, integer stride, integer ascending)
@@ -353,12 +353,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Types.LSLInteger llGetListLength(LSL_Types.list src);
         //wiki: integer llList2Integer(list src, integer index)
         LSL_Types.LSLInteger llList2Integer(LSL_Types.list src, int index);
-        //wiki: double llList2double(list src, integer index)
-        double llList2Float(LSL_Types.list src, int index);
-        //wiki: string llList2String(list src, integer index)
-        string llList2String(LSL_Types.list src, int index);
+        //wiki: LSL_Types.LSLFloat llList2double(list src, integer index)
+        LSL_Types.LSLFloat llList2Float(LSL_Types.list src, int index);
+        //wiki: LSL_Types.LSLString llList2String(list src, integer index)
+        LSL_Types.LSLString llList2String(LSL_Types.list src, int index);
         //wiki: key llList2Key(list src, integer index)
-        string llList2Key(LSL_Types.list src, int index);
+        LSL_Types.LSLString llList2Key(LSL_Types.list src, int index);
         //wiki: vector llList2Vector(list src, integer index)
         LSL_Types.Vector3 llList2Vector(LSL_Types.list src, int index);
         //wiki rotation llList2Rot(list src, integer index)
@@ -369,8 +369,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Types.list llDeleteSubList(LSL_Types.list src, int start, int end);
         //wiki: integer llGetListEntryType(list src, integer index)
         LSL_Types.LSLInteger llGetListEntryType(LSL_Types.list src, int index);
-        //wiki: string llList2CSV(list src)
-        string llList2CSV(LSL_Types.list src);
+        //wiki: LSL_Types.LSLString llList2CSV(list src)
+        LSL_Types.LSLString llList2CSV(LSL_Types.list src);
         //wiki: list llCSV2List(string src)
         LSL_Types.list llCSV2List(string src);
         //wiki: list llListRandomize(list src, integer stride)
@@ -383,12 +383,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Types.list llListInsertList(LSL_Types.list dest, LSL_Types.list src, int start);
         //wiki: integer llListFindList(list src, list test)
         LSL_Types.LSLInteger llListFindList(LSL_Types.list src, LSL_Types.list test);
-        //wiki: string llGetObjectName()
-        string llGetObjectName();
+        //wiki: LSL_Types.LSLString llGetObjectName()
+        LSL_Types.LSLString llGetObjectName();
         //wiki: llSetObjectName(string name)
         void llSetObjectName(string name);
-        //wiki: string llGetDate()
-        string llGetDate();
+        //wiki: LSL_Types.LSLString llGetDate()
+        LSL_Types.LSLString llGetDate();
         //wiki: integer llEdgeOfWorld(vector pos, vector dir)
         LSL_Types.LSLInteger llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir);
         //wiki: integer llGetAgentInfo(key id)
@@ -399,8 +399,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void llSetSoundQueueing(int queue);
         //wiki: llSetSoundRadius(double radius)
         void llSetSoundRadius(double radius);
-        //wiki: string llKey2Name(key id)
-        string llKey2Name(string id);
+        //wiki: LSL_Types.LSLString llKey2Name(key id)
+        LSL_Types.LSLString llKey2Name(string id);
         //wiki: llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, double start, double length, double rate)
         void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate);
         //wiki: llTriggerSoundLimited(string sound, double volume, vector top_north_east, vector bottom_south_west)
@@ -413,9 +413,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         //wiki: integer llOverMyLand(key id)
         LSL_Types.LSLInteger llOverMyLand(string id);
         //wiki: key llGetLandOwnerAt(vector pos)
-        string llGetLandOwnerAt(LSL_Types.Vector3 pos);
+        LSL_Types.LSLString llGetLandOwnerAt(LSL_Types.Vector3 pos);
         //wiki: key llGetNotecardLine(string name, integer line)
-        string llGetNotecardLine(string name, int line);
+        LSL_Types.LSLString llGetNotecardLine(string name, int line);
         //wiki: vector llGetAgentSize(key id)
         LSL_Types.Vector3 llGetAgentSize(string id);
         //wiki: integer llSameGroup(key agent)
@@ -432,12 +432,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Types.LSLInteger llGetAttached();
         //wiki: integer llGetFreeMemory()
         LSL_Types.LSLInteger llGetFreeMemory();
-        //wiki: string llGetRegionName()
-        string llGetRegionName();
-        //wiki: double llGetRegionTimeDilation()
-        double llGetRegionTimeDilation();
-        //wiki: double llGetRegionFPS()
-        double llGetRegionFPS();
+        //wiki: LSL_Types.LSLString llGetRegionName()
+        LSL_Types.LSLString llGetRegionName();
+        //wiki: LSL_Types.LSLFloat llGetRegionTimeDilation()
+        LSL_Types.LSLFloat llGetRegionTimeDilation();
+        //wiki: LSL_Types.LSLFloat llGetRegionFPS()
+        LSL_Types.LSLFloat llGetRegionFPS();
         //wiki: llParticleSystem(List<Object> rules
         void llParticleSystem(LSL_Types.list rules);
         //wiki: llGroundRepel(double height, integer water, double tau)
@@ -461,7 +461,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         //wiki: llSitTarget(vector offset, rotation rot)
         void llSitTarget(LSL_Types.Vector3 offset, LSL_Types.Quaternion rot);
         //wiki key llAvatarOnSitTarget()
-        string llAvatarOnSitTarget();
+        LSL_Types.LSLString llAvatarOnSitTarget();
         //wiki: llAddToLandPassList(key avatar, double hours)
         void llAddToLandPassList(string avatar, double hours);
         //wiki: llSetTouchText(string text)
@@ -473,7 +473,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         //wiki: llSeteCameraAtOffset(vector offset)
         void llSetCameraAtOffset(LSL_Types.Vector3 offset);
         //
-        string llDumpList2String(LSL_Types.list src, string seperator);
+        LSL_Types.LSLString llDumpList2String(LSL_Types.list src, string seperator);
         //wiki: integer llScriptDanger(vector pos)
         LSL_Types.LSLInteger llScriptDanger(LSL_Types.Vector3 pos);
         //wiki: llDialog(key avatar, string message, list buttons, integer chat_channel)
@@ -493,29 +493,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         //wiki: llOpenRemoteDataChannel()
         void llOpenRemoteDataChannel();
         //wiki: key llSendRemoteData(key channel, string dest, integer idata, string sdata)
-        string llSendRemoteData(string channel, string dest, int idata, string sdata);
+        LSL_Types.LSLString llSendRemoteData(string channel, string dest, int idata, string sdata);
         //wiki: llRemoteDataReply(key channel, key message_id, string sdata, integer idata)
         void llRemoteDataReply(string channel, string message_id, string sdata, int idata);
         //wiki: llCloseRemoteDataChannel(key channel)
         void llCloseRemoteDataChannel(string channel);
-        //wiki: string llMD5String(string src, integer nonce)
-        string llMD5String(string src, int nonce);
+        //wiki: LSL_Types.LSLString llMD5String(string src, integer nonce)
+        LSL_Types.LSLString llMD5String(string src, int nonce);
         //wiki: llSetPrimitiveParams(list rules)
         void llSetPrimitiveParams(LSL_Types.list rules);
         //wiki: llSetLinkPrimitiveParams(integer linknumber, list rules)
         void llSetLinkPrimitiveParams(int linknumber, LSL_Types.list rules);
-        //wiki: string llStringToBase64(string str)
-        string llStringToBase64(string str);
-        //wiki: string llBase64ToString(string str)
-        string llBase64ToString(string str);
+        //wiki: LSL_Types.LSLString llStringToBase64(string str)
+        LSL_Types.LSLString llStringToBase64(string str);
+        //wiki: LSL_Types.LSLString llBase64ToString(string str)
+        LSL_Types.LSLString llBase64ToString(string str);
         //wiki: (deprecated)
         void llXorBase64Strings();
         //wiki: llRemoteDataSetRegion()
         void llRemoteDataSetRegion();
-        //wiki: double llLog10(double val)
-        double llLog10(double val);
-        //wiki: double llLog(double val)
-        double llLog(double val);
+        //wiki: LSL_Types.LSLFloat llLog10(double val)
+        LSL_Types.LSLFloat llLog10(double val);
+        //wiki: LSL_Types.LSLFloat llLog(double val)
+        LSL_Types.LSLFloat llLog(double val);
         //wiki: list llGetAnimationList(key id)
         LSL_Types.list llGetAnimationList(string id);
         //wiki: llSetParcelMusicURL(string url)
@@ -524,34 +524,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Types.Vector3 llGetRootPosition();
         //wiki: rotation llGetRootRotation()
         LSL_Types.Quaternion llGetRootRotation();
-        //wiki: string llGetObjectDesc()
-        string llGetObjectDesc();
+        //wiki: LSL_Types.LSLString llGetObjectDesc()
+        LSL_Types.LSLString llGetObjectDesc();
         //wiki: llSetObjectDesc(string desc)
         void llSetObjectDesc(string desc);
         //wiki: key llGetCreator()
-        string llGetCreator();
-        //wiki: string llGetTimestamp()
-        string llGetTimestamp();
+        LSL_Types.LSLString llGetCreator();
+        //wiki: LSL_Types.LSLString llGetTimestamp()
+        LSL_Types.LSLString llGetTimestamp();
         //wiki: llSetLinkAlpha(integer linknumber, double alpha, integer face)
         void llSetLinkAlpha(int linknumber, double alpha, int face);
         //wiki: integer llGetNumberOfPrims()
         LSL_Types.LSLInteger llGetNumberOfPrims();
         //wiki: key llGetNumberOfNotecardLines(string name)
-        string llGetNumberOfNotecardLines(string name);
+        LSL_Types.LSLString llGetNumberOfNotecardLines(string name);
         //wiki: list llGetBoundingBox(key object)
         LSL_Types.list llGetBoundingBox(string obj);
         //wiki: vector llGetGeometricCenter()
         LSL_Types.Vector3 llGetGeometricCenter();
         //wiki: list llGetPrimitiveParams(list rules)
         LSL_Types.list llGetPrimitiveParams(LSL_Types.list rules);
-        //wiki: string llIntegerToBase64(integer number)
-        string llIntegerToBase64(int number);
+        //wiki: LSL_Types.LSLString llIntegerToBase64(integer number)
+        LSL_Types.LSLString llIntegerToBase64(int number);
         //wiki integer llBase64ToInteger(string str)
         LSL_Types.LSLInteger llBase64ToInteger(string str);
-        //wiki: double llGetGMTclock()
-        double llGetGMTclock();
-        //wiki: string llGetSimulatorHostname()
-        string llGetSimulatorHostname();
+        //wiki: LSL_Types.LSLFloat llGetGMTclock()
+        LSL_Types.LSLFloat llGetGMTclock();
+        //wiki: LSL_Types.LSLString llGetSimulatorHostname()
+        LSL_Types.LSLString llGetSimulatorHostname();
         //llSetLocalRot(rotation rot)
         void llSetLocalRot(LSL_Types.Quaternion rot);
         //wiki: list llParseStringKeepNulls(string src, list separators, list spacers)
@@ -569,15 +569,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         //wiki: llSetInventoryPermMask(string item, integer mask, integer value)
         void llSetInventoryPermMask(string item, int mask, int value);
         //wiki: key llGetInventoryCreator(string item)
-        string llGetInventoryCreator(string item);
+        LSL_Types.LSLString llGetInventoryCreator(string item);
         //wiki: llOwnerSay(string msg)
         void llOwnerSay(string msg);
         //wiki: key llRequestSimulatorData(string simulator, integer data)
-        string llRequestSimulatorData(string simulator, int data);
+        LSL_Types.LSLString llRequestSimulatorData(string simulator, int data);
         //wiki: llForceMouselook(integer mouselook)
         void llForceMouselook(int mouselook);
-        //wiki: double llGetObjectMass(key id)
-        double llGetObjectMass(string id);
+        //wiki: LSL_Types.LSLFloat llGetObjectMass(key id)
+        LSL_Types.LSLFloat llGetObjectMass(string id);
         LSL_Types.list llListReplaceList(LSL_Types.list dest, LSL_Types.list src, int start, int end);
         //wiki: llLoadURL(key avatar_id, string message, string url)
         void llLoadURL(string avatar_id, string message, string url);
@@ -598,10 +598,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void llSetPrimURL();
         //wiki: (deprecated)
         void llRefreshPrimURL();
-        //wiki: string llEscapeURL(string url)
-        string llEscapeURL(string url);
-        //wiki: string llUnescapeURL(string url)
-        string llUnescapeURL(string url);
+        //wiki: LSL_Types.LSLString llEscapeURL(string url)
+        LSL_Types.LSLString llEscapeURL(string url);
+        //wiki: LSL_Types.LSLString llUnescapeURL(string url)
+        LSL_Types.LSLString llUnescapeURL(string url);
         //wiki: llMapDestination(string simname, vector pos, vector look_at)
         void llMapDestination(string simname, LSL_Types.Vector3 pos, LSL_Types.Vector3 look_at);
         //wiki: llAddToLandBanList(key avatar, double hours)
@@ -614,17 +614,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void llSetCameraParams(LSL_Types.list rules);
         //wiki: llClearCameraParams()
         void llClearCameraParams();
-        //wiki: double llListStatistics(integer operation, list src)
-        double llListStatistics(int operation, LSL_Types.list src);
+        //wiki: LSL_Types.LSLFloat llListStatistics(integer operation, list src)
+        LSL_Types.LSLFloat llListStatistics(int operation, LSL_Types.list src);
         //wiki: integer llGetUnixTime()
         LSL_Types.LSLInteger llGetUnixTime();
         //wiki: integer llGetParcelFlags(vector pos)
         LSL_Types.LSLInteger llGetParcelFlags(LSL_Types.Vector3 pos);
         //wiki: integer llGetRegionFlags()
         LSL_Types.LSLInteger llGetRegionFlags();
-        //wiki: string llXorBase64StringsCorrect(string str1, string str2)
-        string llXorBase64StringsCorrect(string str1, string str2);
-        string llHTTPRequest(string url, LSL_Types.list parameters, string body);
+        //wiki: LSL_Types.LSLString llXorBase64StringsCorrect(string str1, string str2)
+        LSL_Types.LSLString llXorBase64StringsCorrect(string str1, string str2);
+        LSL_Types.LSLString llHTTPRequest(string url, LSL_Types.list parameters, string body);
         //wiki: llResetLandBanList()
         void llResetLandBanList();
         //wiki: llResetLandPassList()
@@ -641,8 +641,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Types.list llGetParcelDetails(LSL_Types.Vector3 pos, LSL_Types.list param);
         //wiki: llSetLinkTexture(integer linknumber, string texture, integer face)
         void llSetLinkTexture(int linknumber, string texture, int face);
-        //wiki: string llStringTrim(string src, int type)
-        string llStringTrim(string src, int type);
+        //wiki: LSL_Types.LSLString llStringTrim(string src, int type)
+        LSL_Types.LSLString llStringTrim(string src, int type);
         //wiki: LSL_Types.list llGetObjectDetails(string id, LSL_Types.list args)
         LSL_Types.list llGetObjectDetails(string id, LSL_Types.list args);
     }