1 files changed, 1327 insertions, 627 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 83aa245..a8c1a8f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -45,6 +45,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Scripting;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
 using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
@@ -138,8 +139,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        internal TaskInventoryItem m_item;
        internal bool m_OSFunctionsEnabled = false;
        internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
+        internal bool m_debuggerSafe = false;
        internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
        protected IUrlModule m_UrlModule = null;
        public void Initialize(
@@ -148,6 +149,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            m_ScriptEngine = scriptEngine;
            m_host = host;
            m_item = item;
+            m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
            m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
@@ -187,7 +189,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            default:
                break;
            }
-        }
+         }
        public override Object InitializeLifetimeService()
        {
@@ -209,7 +211,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        internal void OSSLError(string msg)
        {
-            OSSLShoutError("OSSL Runtime Error: " + msg);
+            if (m_debuggerSafe)
+                OSSLShoutError(msg);
+            else
+            {
+                throw new ScriptException("OSSL Runtime Error: " + msg);
+            }
        }
        /// <summary>
@@ -244,28 +251,40 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            wComm.DeliverMessage(ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.Name, m_host.UUID, message);
        }
-        // Returns of the function is allowed. Throws a script exception if not allowed.
+        // Returns if OSSL is enabled. Throws a script exception if OSSL is not allowed..
-        public bool CheckThreatLevel(ThreatLevel level, string function)
+        // for safe funtions always active
+        public void CheckThreatLevel()
        {
            if (!m_OSFunctionsEnabled)
-            {
+                throw new ScriptException(String.Format("{0} permission denied.  All OS functions are disabled."));
-                OSSLError(String.Format("{0} permission denied.  All OS functions are disabled.", function));
+        }
-                return false;
-            }
+        // Returns if the function is allowed. Throws a script exception if not allowed.
+        public void CheckThreatLevel(ThreatLevel level, string function)
+        {
+            if (!m_OSFunctionsEnabled)
+                throw new ScriptException(String.Format("{0} permission denied.  All OS functions are disabled.", function));
            string reasonWhyNot = CheckThreatLevelTest(level, function);
            if (!String.IsNullOrEmpty(reasonWhyNot))
-            {
+                throw new ScriptException(reasonWhyNot);
-                OSSLError(reasonWhyNot);
-                return false;
-            }
-            return true;
        }
        // Check to see if function is allowed. Returns an empty string if function permitted
        //     or a string explaining why this function can't be used.
        private string CheckThreatLevelTest(ThreatLevel level, string function)
        {
+            // Grid gods can do anything they damn well please.
+            if (World.Permissions.IsGridGod(m_item.OwnerID))
+                return String.Empty;
+            else
+            {
+                // So can active gods.
+                ScenePresence sp = World.GetScenePresence(m_item.OwnerID);
+                if (sp != null && !sp.IsDeleted && sp.IsGod)
+                    return String.Empty;
+            }
            if (!m_FunctionPerms.ContainsKey(function))
            {
                FunctionPerms perms = new FunctionPerms();
@@ -299,7 +318,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                        foreach (string id in ids)
                        {
                            string current = id.Trim();
-                            if (current.ToUpper() == "PARCEL_GROUP_MEMBER" || current.ToUpper() == "PARCEL_OWNER" || current.ToUpper() == "ESTATE_MANAGER" || current.ToUpper() == "ESTATE_OWNER")
+                            if (current.ToUpper() == "PARCEL_GROUP_MEMBER" || current.ToUpper() == "PARCEL_OWNER" || current.ToUpper() == "ESTATE_MANAGER" || current.ToUpper() == "ESTATE_OWNER" || current.ToUpper() == "ACTIVE_GOD" || current.ToUpper() == "GRID_GOD" || current.ToUpper() == "GOD")
                            {
                                if (!perms.AllowedOwnerClasses.Contains(current))
                                    perms.AllowedOwnerClasses.Add(current.ToUpper());
@@ -404,6 +423,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                        }
                    }
+                    //Only grid gods may use the function
+                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GRID_GOD"))
+                    {
+                        if (World.Permissions.IsGridGod(ownerID))
+                        {
+                            return String.Empty;
+                        }
+                    }
+                    //Any god may use the function
+                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD"))
+                    {
+                        if (World.Permissions.IsAdministrator(ownerID))
+                        {
+                            return String.Empty;
+                        }
+                    }
+                    //Only active gods may use the function
+                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ACTIVE_GOD"))
+                    {
+                        ScenePresence sp = World.GetScenePresence(ownerID);
+                        if (sp != null && !sp.IsDeleted && sp.IsGod)
+                        {
+                            return String.Empty;
+                        }
+                    }
                    if (!m_FunctionPerms[function].AllowedCreators.Contains(m_item.CreatorID))
                        return(
                            String.Format("{0} permission denied. Script creator is not in the list of users allowed to execute this function and prim owner also has no permission.",
@@ -425,16 +473,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            OSSLShoutError(string.Format("Use of function {0} is deprecated. Use {1} instead.", function, replacement));
        }
+////        protected void ScriptSleep(int delay)
+////        {
+////            delay = (int)((float)delay * m_ScriptDelayFactor);
+////            if (delay == 0)
+////                return;
+////            System.Threading.Thread.Sleep(delay);
+////        }
        public LSL_Integer osSetTerrainHeight(int x, int y, double val)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osSetTerrainHeight"))  return 0;
+            CheckThreatLevel(ThreatLevel.High, "osSetTerrainHeight");
            return SetTerrainHeight(x, y, val);
        }
        public LSL_Integer osTerrainSetHeight(int x, int y, double val)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osTerrainSetHeight"))  return 0;
+            CheckThreatLevel(ThreatLevel.High, "osTerrainSetHeight");
            OSSLDeprecated("osTerrainSetHeight", "osSetTerrainHeight");
            return SetTerrainHeight(x, y, val);
@@ -442,8 +498,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        private LSL_Integer SetTerrainHeight(int x, int y, double val)
        {
-            m_host.AddScriptLPS(1);
            if (x > (World.RegionInfo.RegionSizeX - 1) || x < 0 || y > (World.RegionInfo.RegionSizeY - 1) || y < 0)
                OSSLError("osSetTerrainHeight: Coordinate out of bounds");
@@ -471,7 +525,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        private LSL_Float GetTerrainHeight(int x, int y)
        {
-            m_host.AddScriptLPS(1);
            if (x > (World.RegionInfo.RegionSizeX - 1) || x < 0 || y > (World.RegionInfo.RegionSizeY - 1) || y < 0)
                OSSLError("osGetTerrainHeight: Coordinate out of bounds");
@@ -480,8 +533,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osTerrainFlush()
        {
-            if (!CheckThreatLevel(ThreatLevel.VeryLow, "osTerrainFlush"))  return;
+            CheckThreatLevel(ThreatLevel.VeryLow, "osTerrainFlush");
-            m_host.AddScriptLPS(1);
            ITerrainModule terrainModule = World.RequestModuleInterface<ITerrainModule>();
            if (terrainModule != null) terrainModule.TaintTerrain();
@@ -495,31 +547,40 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // The underlying functionality is fixed, since the security
            // as such is sound
            //
-            if (!CheckThreatLevel(ThreatLevel.High, "osRegionRestart"))  return 0;
+            CheckThreatLevel(ThreatLevel.High, "osRegionRestart");
            IRestartModule restartModule = World.RequestModuleInterface<IRestartModule>();
-            m_host.AddScriptLPS(1);
            if (World.Permissions.CanIssueEstateCommand(m_host.OwnerID, false) && (restartModule != null))
            {
                if (seconds < 15)
                {
-                    restartModule.AbortRestart("Restart aborted");
+                    restartModule.AbortRestart("Region restart has been aborted\n");
                    return 1;
                }
-                List<int> times = new List<int>();
+                RegionRestart(seconds, String.Empty);
-                while (seconds > 0)
+                return 1;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+        public int osRegionRestart(double seconds, string msg)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osRegionRestart");
+            IRestartModule restartModule = World.RequestModuleInterface<IRestartModule>();
+            if (World.Permissions.CanIssueEstateCommand(m_host.OwnerID, false) && (restartModule != null))
+            {
+                if (seconds < 15)
                {
-                    times.Add((int)seconds);
+                    restartModule.AbortRestart("Region restart has been aborted\n");
-                    if (seconds > 300)
+                    return 1;
-                        seconds -= 120;
-                    else if (seconds > 30)
-                        seconds -= 30;
-                    else
-                        seconds -= 15;
                }
-                restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true);
+                RegionRestart(seconds, msg);
                return 1;
            }
            else
@@ -528,15 +589,38 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            }
        }
+        private void RegionRestart(double seconds, string msg)
+        {
+            IRestartModule restartModule = World.RequestModuleInterface<IRestartModule>();
+            List<int> times = new List<int>();
+            while (seconds > 0)
+            {
+                times.Add((int)seconds);
+                if (seconds > 300)
+                    seconds -= 120;
+                else if (seconds > 120)
+                    seconds -= 60;
+                else if (seconds > 60)
+                    seconds -= 30;
+                else
+                    seconds -= 15;
+            }
+            if (msg == String.Empty)
+                restartModule.ScheduleRestart(UUID.Zero, "Region: " + World.RegionInfo.RegionName + " is about to restart.\n\nIf you stay here you will be logged out.\n\n\nTime remaining: {0}.\n", times.ToArray(), true);
+            else
+                restartModule.ScheduleRestart(UUID.Zero, msg + "\n\nTime remaining: {0}.\n", times.ToArray(), true);
+        }
        public void osRegionNotice(string msg)
        {
            // This implementation provides absolutely no security
            // It's high griefing potential makes this classification
            // necessary
            //
-            if (!CheckThreatLevel(ThreatLevel.VeryHigh, "osRegionNotice"))  return;
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osRegionNotice");
-            m_host.AddScriptLPS(1);
            IDialogModule dm = World.RequestModuleInterface<IDialogModule>();
@@ -549,9 +633,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // This function has no security. It can be used to destroy
            // arbitrary builds the user would normally have no rights to
            //
-            if (!CheckThreatLevel(ThreatLevel.VeryHigh, "osSetRot"))  return;
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osSetRot");
-            m_host.AddScriptLPS(1);
            if (World.Entities.ContainsKey(target))
            {
                EntityBase entity;
@@ -572,13 +655,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams,
                                             int timer)
        {
-            m_host.AddScriptLPS(1);
            if (dynamicID == String.Empty)
            {
                IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
                UUID createdTexture =
                    textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
-                                                        extraParams, timer);
+                                                        extraParams);
                return createdTexture.ToString();
            }
            else
@@ -592,13 +674,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams,
                                             int timer, int alpha)
        {
-            m_host.AddScriptLPS(1);
            if (dynamicID == String.Empty)
            {
                IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
                UUID createdTexture =
                    textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
-                                                        extraParams, timer, true, (byte) alpha);
+                                                        extraParams, true, (byte) alpha);
                return createdTexture.ToString();
            }
            else
@@ -612,13 +693,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams,
                                             bool blend, int disp, int timer, int alpha, int face)
        {
-            m_host.AddScriptLPS(1);
            if (dynamicID == String.Empty)
            {
                IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
                UUID createdTexture =
                    textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
-                                                        extraParams, timer, blend, disp, (byte) alpha, face);
+                                                        extraParams, blend, disp, (byte) alpha, face);
                return createdTexture.ToString();
            }
            else
@@ -632,7 +712,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams,
                                           int timer)
        {
-            m_host.AddScriptLPS(1);
+            return osSetDynamicTextureDataFace(dynamicID, contentType, data, extraParams, timer, -1);
+        }
+        public string osSetDynamicTextureDataFace(string dynamicID, string contentType, string data, string extraParams,
+                                           int timer, int face)
+        {
            if (dynamicID == String.Empty)
            {
                IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
@@ -644,7 +729,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    }
                    UUID createdTexture =
                        textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
-                                                            extraParams, timer);
+                                                            extraParams, false, 3, 255, face);
                    return createdTexture.ToString();
                }
            }
@@ -659,7 +745,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams,
                                          int timer, int alpha)
        {
-            m_host.AddScriptLPS(1);
            if (dynamicID == String.Empty)
            {
                IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
@@ -671,7 +756,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    }
                    UUID createdTexture =
                        textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
-                                                            extraParams, timer, true, (byte) alpha);
+                                                            extraParams, true, (byte) alpha);
                    return createdTexture.ToString();
                }
            }
@@ -686,7 +771,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams,
                                          bool blend, int disp, int timer, int alpha, int face)
        {
-            m_host.AddScriptLPS(1);
            if (dynamicID == String.Empty)
            {
                IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
@@ -698,7 +782,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    }
                    UUID createdTexture =
                        textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
-                                                            extraParams, timer, blend, disp, (byte) alpha, face);
+                                                            extraParams, blend, disp, (byte) alpha, face);
                    return createdTexture.ToString();
                }
            }
@@ -712,9 +796,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public bool osConsoleCommand(string command)
        {
-            if (!CheckThreatLevel(ThreatLevel.Severe, "osConsoleCommand"))  return false;
+            CheckThreatLevel(ThreatLevel.Severe, "osConsoleCommand");
-            m_host.AddScriptLPS(1);
            // For safety, we add another permission check here, and don't rely only on the standard OSSL permissions
            if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
@@ -728,123 +810,163 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSetPrimFloatOnWater(int floatYN)
        {
-            if (!CheckThreatLevel(ThreatLevel.VeryLow, "osSetPrimFloatOnWater"))  return;
+            CheckThreatLevel(ThreatLevel.VeryLow, "osSetPrimFloatOnWater");
-            m_host.AddScriptLPS(1);
            m_host.ParentGroup.RootPart.SetFloatOnWater(floatYN);
        }
+        private bool checkAllowAgentTPbyLandOwner(UUID agentId, Vector3 pos)
+        {
+            UUID hostOwner = m_host.OwnerID;
+            if(hostOwner == agentId)
+                return true;
+            if (m_item.PermsGranter == agentId)
+            {
+                if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TELEPORT) != 0)
+                    return true;
+            }
+            ILandObject land = World.LandChannel.GetLandObject(pos);
+            if(land == null)
+                return true;
+            LandData landdata = land.LandData;
+            if(landdata == null)
+                return true;
+            if(landdata.OwnerID == hostOwner)
+                return true;
+            EstateSettings es = World.RegionInfo.EstateSettings;
+            if(es != null && es.IsEstateManagerOrOwner(hostOwner))
+                return true;
+            if(!landdata.IsGroupOwned)
+                return false;
+            UUID landGroup = landdata.GroupID;
+            if(landGroup == UUID.Zero)
+                return false;
+            if(landGroup == m_host.GroupID)
+                return true;
+            return false;
+        }
        // Teleport functions
        public void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
            // High because there is no security check. High griefer potential
            //
-            if (!CheckThreatLevel(ThreatLevel.High, "osTeleportAgent"))  return;
+            CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent");
-            TeleportAgent(agent, regionName, position, lookat, false);
+            TeleportAgent(agent, regionName, position, lookat);
        }
        private void TeleportAgent(string agent, string regionName,
-            LSL_Types.Vector3 position, LSL_Types.Vector3 lookat, bool relaxRestrictions)
+            LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
-            m_host.AddScriptLPS(1);
+            if(String.IsNullOrEmpty(regionName))
-            UUID agentId = new UUID();
+                regionName = World.RegionInfo.RegionName;
+            UUID agentId;
            if (UUID.TryParse(agent, out agentId))
            {
                ScenePresence presence = World.GetScenePresence(agentId);
-                if (presence != null)
+                if (presence == null || presence.IsDeleted || presence.IsInTransit)
-                {
+                    return;
-                    // For osTeleportAgent, agent must be over owners land to avoid abuse
-                    // For osTeleportOwner, this restriction isn't necessary
+                Vector3 pos = presence.AbsolutePosition;
+                if(!checkAllowAgentTPbyLandOwner(agentId, pos))
-                    // commented out because its redundant and uneeded please remove eventually.
+                    return;
-                    // if (relaxRestrictions ||
-                    //    m_host.OwnerID
-                    //    == World.LandChannel.GetLandObject(
-                    //        presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
-                    // {
-                        // We will launch the teleport on a new thread so that when the script threads are terminated
-                        // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.                        
-                        Util.FireAndForget(
-                            o => World.RequestTeleportLocation(
-                                presence.ControllingClient, regionName, position,
-                                lookat, (uint)TPFlags.ViaLocation), 
-                            null, "OSSL_Api.TeleportAgentByRegionCoords");
-                    // }
+                if(regionName == World.RegionInfo.RegionName)
+                {
+                    // should be faster than going to threadpool
+                    World.RequestTeleportLocation(presence.ControllingClient, regionName, position,
+                        lookat, (uint)(TPFlags.ViaLocation | TPFlags.ViaScript));
+                }
+                else
+                {
+                // We will launch the teleport on a new thread so that when the script threads are terminated
+                // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
+                Util.FireAndForget(
+                    o => World.RequestTeleportLocation(
+                        presence.ControllingClient, regionName, position,
+                        lookat, (uint)(TPFlags.ViaLocation | TPFlags.ViaScript)),
+                    null, "OSSL_Api.TeleportAgentByRegionCoords");
                }
            }
        }
-        public void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
+        public void osTeleportAgent(string agent, int regionGridX, int regionGridY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
            // High because there is no security check. High griefer potential
            //
-            if (!CheckThreatLevel(ThreatLevel.High, "osTeleportAgent"))  return;
+            CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent");
-            TeleportAgent(agent, regionX, regionY, position, lookat, false);
+            TeleportAgent(agent, regionGridX, regionGridY, position, lookat);
        }
-        private void TeleportAgent(string agent, int regionX, int regionY,
+        private void TeleportAgent(string agent, int regionGridX, int regionGridY,
-            LSL_Types.Vector3 position, LSL_Types.Vector3 lookat, bool relaxRestrictions)
+            LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
-            // ulong regionHandle = Util.UIntsToLong(((uint)regionX * (uint)Constants.RegionSize), ((uint)regionY * (uint)Constants.RegionSize));
+            ulong regionHandle = Util.RegionGridLocToHandle((uint)regionGridX, (uint)regionGridY);
-            ulong regionHandle = Util.RegionLocToHandle((uint)regionX, (uint)regionY);
-            m_host.AddScriptLPS(1);
+            UUID agentId;
-            UUID agentId = new UUID();
            if (UUID.TryParse(agent, out agentId))
            {
                ScenePresence presence = World.GetScenePresence(agentId);
-                if (presence != null)
+                if (presence == null || presence.IsDeleted || presence.IsInTransit)
-                {
+                    return;
-                    // For osTeleportAgent, agent must be over owners land to avoid abuse
-                    // For osTeleportOwner, this restriction isn't necessary
-                    // commented out because its redundant and uneeded please remove eventually.
-                    // if (relaxRestrictions ||
-                    //    m_host.OwnerID
-                    //    == World.LandChannel.GetLandObject(
-                    //        presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
-                    // {
-                        // We will launch the teleport on a new thread so that when the script threads are terminated
-                        // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
-                        Util.FireAndForget(
-                            o => World.RequestTeleportLocation(
-                                presence.ControllingClient, regionHandle, 
-                                position, lookat, (uint)TPFlags.ViaLocation), 
-                            null, "OSSL_Api.TeleportAgentByRegionName");
-                   //  }
-                }
+                Vector3 pos = presence.AbsolutePosition;
+                if(!checkAllowAgentTPbyLandOwner(agentId, pos))
+                    return;
+                Util.FireAndForget(
+                    o => World.RequestTeleportLocation(
+                        presence.ControllingClient, regionHandle,
+                        position, lookat, (uint)(TPFlags.ViaLocation | TPFlags.ViaScript)),
+                    null, "OSSL_Api.TeleportAgentByRegionName");
            }
        }
        public void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
-            // High because there is no security check. High griefer potential
+            UUID agentId;
-            //
+            if (UUID.TryParse(agent, out agentId))
-            if (!CheckThreatLevel(ThreatLevel.High, "osTeleportAgent"))  return;
+            {
+                ScenePresence presence = World.GetScenePresence(agentId);
+                if (presence == null || presence.IsDeleted || presence.IsInTransit)
+                    return;
+                Vector3 pos = presence.AbsolutePosition;
+                if(!checkAllowAgentTPbyLandOwner(agentId, pos))
+                    return;
-            osTeleportAgent(agent, World.RegionInfo.RegionName, position, lookat);
+                World.RequestTeleportLocation(presence.ControllingClient, World.RegionInfo.RegionName, position,
+                    lookat, (uint)(TPFlags.ViaLocation | TPFlags.ViaScript));
+            }
        }
        public void osTeleportOwner(string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
-            TeleportAgent(m_host.OwnerID.ToString(), regionName, position, lookat, true);
+            // Threat level None because this is what can already be done with the World Map in the viewer
+            TeleportAgent(m_host.OwnerID.ToString(), regionName, position, lookat);
        }
-        public void osTeleportOwner(LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
+        public void osTeleportOwner(int regionGridX, int regionGridY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
-            osTeleportOwner(World.RegionInfo.RegionName, position, lookat);
+            TeleportAgent(m_host.OwnerID.ToString(), regionGridX, regionGridY, position, lookat);
        }
-        public void osTeleportOwner(int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
+        public void osTeleportOwner(LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
        {
-            TeleportAgent(m_host.OwnerID.ToString(), regionX, regionY, position, lookat, true);
+            osTeleportAgent(m_host.OwnerID.ToString(), position, lookat);
        }
        ///<summary>
@@ -856,9 +978,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <param name="avatar"></param>
        public void osForceOtherSit(string avatar)
        {
-            if (!CheckThreatLevel(ThreatLevel.VeryHigh, "osForceOtherSit"))  return;
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osForceOtherSit");
-            m_host.AddScriptLPS(1);
            ForceSit(avatar, m_host.UUID);
        }
@@ -871,9 +991,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <param name="target"></param>
        public void osForceOtherSit(string avatar, string target)
        {
-            if (!CheckThreatLevel(ThreatLevel.VeryHigh, "osForceOtherSit"))  return;
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osForceOtherSit");
-            m_host.AddScriptLPS(1);
            UUID targetID = new UUID(target);
@@ -882,7 +1000,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void ForceSit(string avatar, UUID targetID)
        {
-            UUID agentID; 
+            UUID agentID;
            if (!UUID.TryParse(avatar, out agentID))
                return;
@@ -900,21 +1018,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    part.SitTargetPosition);
        }
-        // Functions that get information from the agent itself.
+        // Get a list of all the avatars/agents in the region
-        //
+        public LSL_List osGetAgents()
-        // osGetAgentIP - this is used to determine the IP address of
+        {
-        //the client.  This is needed to help configure other in world
+            // threat level is None as we could get this information with an
-        //resources based on the IP address of the clients connected.
+            // in-world script as well, just not as efficient
-        //I think High is a good risk level for this, as it is an
+            LSL_List result = new LSL_List();
-        //information leak.
+            World.ForEachRootScenePresence(delegate(ScenePresence sp)
-        // Severe is even better coz privacy is important.
+            {
+                result.Add(new LSL_String(sp.Name));
+            });
+            return result;
+        }
        public string osGetAgentIP(string agent)
        {
-            if (!CheckThreatLevel(ThreatLevel.Severe, "osGetAgentIP"))  return "";
+            CheckThreatLevel(ThreatLevel.Severe, "osGetAgentIP");
+            if(!(World.Permissions.IsGod(m_host.OwnerID))) // user god always needed
+                return "";
            UUID avatarID = (UUID)agent;
-            m_host.AddScriptLPS(1);
            if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence)
            {
                ScenePresence target = (ScenePresence)World.Entities[avatarID];
@@ -925,61 +1049,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            return "";
        }
-        // Get a list of all the avatars/agents in the region
-        public LSL_List osGetAgents()
-        {
-            m_host.AddScriptLPS(1);
-            LSL_List result = new LSL_List();
-            World.ForEachRootScenePresence(delegate(ScenePresence sp)
-            {
-                result.Add(new LSL_String(sp.Name));
-            });
-            return result;
-        }
        // Adam's super super custom animation functions
        public void osAvatarPlayAnimation(string avatar, string animation)
        {
-            if (!CheckThreatLevel(ThreatLevel.VeryHigh, "osAvatarPlayAnimation"))  return;
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osAvatarPlayAnimation");
            AvatarPlayAnimation(avatar, animation);
        }
        private void AvatarPlayAnimation(string avatar, string animation)
        {
-            UUID avatarID = (UUID)avatar;
+            UUID avatarID;
+            if(!UUID.TryParse(avatar, out avatarID))
+                return;
+            ScenePresence target = World.GetScenePresence(avatarID);
+            if (target == null)
+                return;
-            m_host.AddScriptLPS(1);
+            UUID animID = UUID.Zero;
-            if (World.Entities.ContainsKey((UUID)avatar) && World.Entities[avatarID] is ScenePresence)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
            {
-                ScenePresence target = (ScenePresence)World.Entities[avatarID];
+                if (inv.Value.Type == (int)AssetType.Animation)
-                if (target != null)
                {
-                    UUID animID=UUID.Zero;
+                   if (inv.Value.Name == animation)
-                    lock (m_host.TaskInventory)
+                   {
-                    {
+                       animID = inv.Value.AssetID;
-                        foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                       break;
-                        {
+                   }
-                            if (inv.Value.Name == animation)
-                            {
-                                if (inv.Value.Type == (int)AssetType.Animation)
-                                    animID = inv.Value.AssetID;
-                                continue;
-                            }
-                        }
-                    }
-                    if (animID == UUID.Zero)
-                        target.Animator.AddAnimation(animation, m_host.UUID);
-                    else
-                        target.Animator.AddAnimation(animID, m_host.UUID);
                }
            }
+            m_host.TaskInventory.LockItemsForRead(false);
+            if (animID == UUID.Zero)
+                target.Animator.AddAnimation(animation, m_host.UUID);
+            else
+                target.Animator.AddAnimation(animID, m_host.UUID);
        }
        public void osAvatarStopAnimation(string avatar, string animation)
        {
-            if (!CheckThreatLevel(ThreatLevel.VeryHigh, "osAvatarStopAnimation"))  return;
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osAvatarStopAnimation");
            AvatarStopAnimation(avatar, animation);
        }
@@ -988,8 +1099,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            UUID avatarID = (UUID)avatar;
-            m_host.AddScriptLPS(1);
            // FIXME: What we really want to do here is factor out the similar code in llStopAnimation() to a common
            // method (though see that doesn't do the is animation check, which is probably a bug) and have both
            // these functions call that common code.  However, this does mean navigating the brain-dead requirement
@@ -1010,6 +1119,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            animID = UUID.Zero;
                    }
                    if (animID == UUID.Zero)
                        target.Animator.RemoveAnimation(animation);
                    else
@@ -1019,59 +1129,81 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        }
        //Texture draw functions
+        public string osDrawResetTransform(string drawList)
+        {
+            drawList += "ResetTransf;";
+            return drawList;
+        }
+        public string osDrawRotationTransform(string drawList, LSL_Float x)
+        {
+            drawList += "RotTransf " + x + ";";
+            return drawList;
+        }
+        public string osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y)
+        {
+            drawList += "ScaleTransf " + x + "," + y + ";";
+            return drawList;
+        }
+        public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y)
+        {
+            drawList += "TransTransf " + x + "," + y + ";";
+            return drawList;
+        }
        public string osMovePen(string drawList, int x, int y)
        {
-            m_host.AddScriptLPS(1);
            drawList += "MoveTo " + x + "," + y + ";";
            return drawList;
        }
        public string osDrawLine(string drawList, int startX, int startY, int endX, int endY)
        {
-            m_host.AddScriptLPS(1);
            drawList += "MoveTo "+ startX+","+ startY +"; LineTo "+endX +","+endY +"; ";
            return drawList;
        }
        public string osDrawLine(string drawList, int endX, int endY)
        {
-            m_host.AddScriptLPS(1);
            drawList += "LineTo " + endX + "," + endY + "; ";
            return drawList;
        }
        public string osDrawText(string drawList, string text)
        {
-            m_host.AddScriptLPS(1);
            drawList += "Text " + text + "; ";
            return drawList;
        }
        public string osDrawEllipse(string drawList, int width, int height)
        {
-            m_host.AddScriptLPS(1);
            drawList += "Ellipse " + width + "," + height + "; ";
            return drawList;
        }
+        public string osDrawFilledEllipse(string drawList, int width, int height)
+        {
+            drawList += "FillEllipse " + width + "," + height + "; ";
+            return drawList;
+        }
        public string osDrawRectangle(string drawList, int width, int height)
        {
-            m_host.AddScriptLPS(1);
            drawList += "Rectangle " + width + "," + height + "; ";
            return drawList;
        }
        public string osDrawFilledRectangle(string drawList, int width, int height)
        {
-            m_host.AddScriptLPS(1);
            drawList += "FillRectangle " + width + "," + height + "; ";
            return drawList;
        }
        public string osDrawFilledPolygon(string drawList, LSL_List x, LSL_List y)
        {
-            m_host.AddScriptLPS(1);
            if (x.Length != y.Length || x.Length < 3)
            {
                return "";
@@ -1087,8 +1219,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osDrawPolygon(string drawList, LSL_List x, LSL_List y)
        {
-            m_host.AddScriptLPS(1);
            if (x.Length != y.Length || x.Length < 3)
            {
                return "";
@@ -1104,28 +1234,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osSetFontSize(string drawList, int fontSize)
        {
-            m_host.AddScriptLPS(1);
            drawList += "FontSize "+ fontSize +"; ";
            return drawList;
        }
        public string osSetFontName(string drawList, string fontName)
        {
-            m_host.AddScriptLPS(1);
            drawList += "FontName "+ fontName +"; ";
            return drawList;
        }
        public string osSetPenSize(string drawList, int penSize)
        {
-            m_host.AddScriptLPS(1);
            drawList += "PenSize " + penSize + "; ";
            return drawList;
        }
        public string osSetPenColor(string drawList, string color)
        {
-            m_host.AddScriptLPS(1);
            drawList += "PenColor " + color + "; ";
            return drawList;
        }
@@ -1135,29 +1261,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            OSSLDeprecated("osSetPenColour", "osSetPenColor");
-            m_host.AddScriptLPS(1);
            drawList += "PenColour " + colour + "; ";
            return drawList;
        }
        public string osSetPenCap(string drawList, string direction, string type)
        {
-            m_host.AddScriptLPS(1);
            drawList += "PenCap " + direction + "," + type + "; ";
            return drawList;
        }
        public string osDrawImage(string drawList, int width, int height, string imageUrl)
        {
-            m_host.AddScriptLPS(1);
            drawList +="Image " +width + "," + height+ ","+ imageUrl +"; " ;
            return drawList;
        }
        public LSL_Vector osGetDrawStringSize(string contentType, string text, string fontName, int fontSize)
        {
-            m_host.AddScriptLPS(1);
            LSL_Vector vec = new LSL_Vector(0,0,0);
            IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
            if (textureManager != null)
@@ -1178,17 +1299,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // It was probably added as a crutch or debugging aid, and
            // should be removed
            //
-            if (!CheckThreatLevel(ThreatLevel.High, "osSetStateEvents"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osSetStateEvents");
-            m_host.AddScriptLPS(1);
            m_host.SetScriptEvents(m_item.ItemID, events);
        }
        public void osSetRegionWaterHeight(double height)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osSetRegionWaterHeight"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osSetRegionWaterHeight");
-            m_host.AddScriptLPS(1);
            World.EventManager.TriggerRequestChangeWaterHeight((float)height);
        }
@@ -1201,9 +1319,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <param name="sunHour">The "Sun Hour" that is desired, 0...24, with 0 just after SunRise</param>
        public void osSetRegionSunSettings(bool useEstateSun, bool sunFixed, double sunHour)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osSetRegionSunSettings"))  return;
+            CheckThreatLevel(ThreatLevel.Nuisance, "osSetRegionSunSettings");
-            m_host.AddScriptLPS(1);
            while (sunHour > 24.0)
                sunHour -= 24.0;
@@ -1226,9 +1342,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <param name="sunHour">The "Sun Hour" that is desired, 0...24, with 0 just after SunRise</param>
        public void osSetEstateSunSettings(bool sunFixed, double sunHour)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osSetEstateSunSettings"))  return;
+            CheckThreatLevel(ThreatLevel.Nuisance, "osSetEstateSunSettings");
-            m_host.AddScriptLPS(1);
            while (sunHour > 24.0)
                sunHour -= 24.0;
@@ -1250,8 +1364,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public double osGetCurrentSunHour()
        {
-            m_host.AddScriptLPS(1);
            // Must adjust for the fact that Region Sun Settings are still LL offset
            double sunHour = World.RegionInfo.RegionSettings.SunPosition - 6;
@@ -1278,8 +1390,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        private double GetSunParam(string param)
        {
-            m_host.AddScriptLPS(1);
            double value = 0.0;
            ISunModule module = World.RequestModuleInterface<ISunModule>();
@@ -1293,21 +1403,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSunSetParam(string param, double value)
        {
-////            if (!CheckThreatLevel(ThreatLevel.None, "osSunSetParam"))  return;
+            CheckThreatLevel(ThreatLevel.Nuisance, "osSunSetParam");
            OSSLDeprecated("osSunSetParam", "osSetSunParam");
            SetSunParam(param, value);
        }
        public void osSetSunParam(string param, double value)
        {
-////            if (!CheckThreatLevel(ThreatLevel.None, "osSetSunParam"))  return;
+            CheckThreatLevel(ThreatLevel.Nuisance, "osSetSunParam");
            SetSunParam(param, value);
        }
        private void SetSunParam(string param, double value)
        {
-            m_host.AddScriptLPS(1);
            ISunModule module = World.RequestModuleInterface<ISunModule>();
            if (module != null)
            {
@@ -1317,8 +1425,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osWindActiveModelPluginName()
        {
-            m_host.AddScriptLPS(1);
            IWindModule module = World.RequestModuleInterface<IWindModule>();
            if (module != null)
            {
@@ -1330,8 +1436,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSetWindParam(string plugin, string param, LSL_Float value)
        {
-            if (!CheckThreatLevel(ThreatLevel.VeryLow, "osSetWindParam"))  return;
+            CheckThreatLevel(ThreatLevel.Nuisance, "osSetWindParam");
-            m_host.AddScriptLPS(1);
            IWindModule module = World.RequestModuleInterface<IWindModule>();
            if (module != null)
@@ -1346,8 +1451,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Float osGetWindParam(string plugin, string param)
        {
-            m_host.AddScriptLPS(1);
            IWindModule module = World.RequestModuleInterface<IWindModule>();
            if (module != null)
            {
@@ -1360,8 +1463,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        // Routines for creating and managing parcels programmatically
        public void osParcelJoin(LSL_Vector pos1, LSL_Vector pos2)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osParcelJoin"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osParcelJoin");
-            m_host.AddScriptLPS(1);
            int startx = (int)(pos1.x < pos2.x ? pos1.x : pos2.x);
            int starty = (int)(pos1.y < pos2.y ? pos1.y : pos2.y);
@@ -1373,8 +1475,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osParcelSubdivide(LSL_Vector pos1, LSL_Vector pos2)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osParcelSubdivide"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osParcelSubdivide");
-            m_host.AddScriptLPS(1);
            int startx = (int)(pos1.x < pos2.x ? pos1.x : pos2.x);
            int starty = (int)(pos1.y < pos2.y ? pos1.y : pos2.y);
@@ -1387,7 +1488,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osParcelSetDetails(LSL_Vector pos, LSL_List rules)
        {
            const string functionName = "osParcelSetDetails";
-            if (!CheckThreatLevel(ThreatLevel.High, functionName))  return;
+            CheckThreatLevel(ThreatLevel.High, functionName);
            OSSLDeprecated(functionName, "osSetParcelDetails");
            SetParcelDetails(pos, rules, functionName);
        }
@@ -1395,14 +1496,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osSetParcelDetails(LSL_Vector pos, LSL_List rules)
        {
            const string functionName = "osSetParcelDetails";
-            if (!CheckThreatLevel(ThreatLevel.High, functionName))  return;
+            CheckThreatLevel(ThreatLevel.High, functionName);
            SetParcelDetails(pos, rules, functionName);
        }
        private void SetParcelDetails(LSL_Vector pos, LSL_List rules, string functionName)
        {
-            m_host.AddScriptLPS(1);
            // Get a reference to the land data and make sure the owner of the script
            // can modify it
@@ -1413,15 +1512,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                return;
            }
-            if (!World.Permissions.CanEditParcelProperties(m_host.OwnerID, startLandObject, GroupPowers.LandOptions))
+            if (!World.Permissions.CanEditParcelProperties(m_host.OwnerID, startLandObject, GroupPowers.LandOptions, false))
            {
-                OSSLShoutError("You do not have permission to modify the parcel");
+                OSSLShoutError("script owner does not have permission to modify the parcel");
                return;
            }
            // Create a new land data object we can modify
            LandData newLand = startLandObject.LandData.Copy();
            UUID uuid;
+            EstateSettings es = World.RegionInfo.EstateSettings;
+            bool changed = false;
+            bool changedSeeAvs = false;
+            bool changedoverlay = false;
+            bool changedneedupdate = false;
            // Process the rules, not sure what the impact would be of changing owner or group
            for (int idx = 0; idx < rules.Length;)
@@ -1431,35 +1536,151 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                switch (code)
                {
                    case ScriptBaseClass.PARCEL_DETAILS_NAME:
-                        newLand.Name = arg;
+                        if(newLand.Name != arg)
+                        {
+                            newLand.Name = arg;
+                            changed = true;
+                        }
                        break;
                    case ScriptBaseClass.PARCEL_DETAILS_DESC:
-                        newLand.Description = arg;
+                        if(newLand.Description != arg)
+                        {
+                            newLand.Description = arg;
+                            changed = true;
+                        }
                        break;
                    case ScriptBaseClass.PARCEL_DETAILS_OWNER:
-                        if (!CheckThreatLevel(ThreatLevel.VeryHigh, functionName))  return;
+                        if(es != null && !es.IsEstateManagerOrOwner(m_host.OwnerID))
-                        if (UUID.TryParse(arg, out uuid))
+                        {
-                            newLand.OwnerID = uuid;
+                            OSSLError("script owner does not have permission to modify the parcel owner");
+                        }
+                        else
+                        {
+                            if (UUID.TryParse(arg, out uuid))
+                            {
+                                if(newLand.OwnerID != uuid)
+                                {
+                                    changed = true;
+                                    newLand.OwnerID = uuid;
+                                    newLand.GroupID = UUID.Zero;
+                                }
+                            }
+                        }
                        break;
                    case ScriptBaseClass.PARCEL_DETAILS_GROUP:
-                        if (!CheckThreatLevel(ThreatLevel.VeryHigh, functionName))  return;
+                        if(m_host.OwnerID == newLand.OwnerID || es == null || es.IsEstateManagerOrOwner(m_host.OwnerID))
-                        if (UUID.TryParse(arg, out uuid))
+                        {
-                            newLand.GroupID = uuid;
+                            if (UUID.TryParse(arg, out uuid))
+                            {
+                                if(newLand.GroupID != uuid)
+                                {
+                                    if(uuid == UUID.Zero)
+                                    {
+                                        changed = true;
+                                        newLand.GroupID = uuid;
+                                    }
+                                    else
+                                    {
+                                        IGroupsModule groupsModule = m_ScriptEngine.World.RequestModuleInterface<IGroupsModule>();
+                                        GroupMembershipData member = null;
+                                        if (groupsModule != null)
+                                            member = groupsModule.GetMembershipData(uuid, newLand.OwnerID);
+                                        if (member == null)
+                                            OSSLError(string.Format("land owner is not member of the new group for parcel"));
+                                        else
+                                        {
+                                            changed = true;
+                                            newLand.GroupID = uuid;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        else
+                        {
+                            OSSLError("script owner does not have permission to modify the parcel group");
+                        }
                        break;
                    case ScriptBaseClass.PARCEL_DETAILS_CLAIMDATE:
-                        if (!CheckThreatLevel(ThreatLevel.VeryHigh, functionName))  return;
+                        if(es != null && !es.IsEstateManagerOrOwner(m_host.OwnerID))
-                        newLand.ClaimDate = Convert.ToInt32(arg);
+                        {
-                        if (newLand.ClaimDate == 0)
+                            OSSLError("script owner does not have permission to modify the parcel CLAIM DATE");
-                            newLand.ClaimDate = Util.UnixTimeSinceEpoch();
+                        }
+                        else
+                        {
+                            int date =  Convert.ToInt32(arg);
+                            if (date == 0)
+                                date = Util.UnixTimeSinceEpoch();
+                            if(newLand.ClaimDate != date)
+                            {
+                                changed = true;
+                                newLand.ClaimDate = date;
+                            }
+                        }
+                        break;
+                    case ScriptBaseClass.PARCEL_DETAILS_SEE_AVATARS:
+                        bool newavs = (Convert.ToInt32(arg) != 0);
+                        if(newLand.SeeAVs != newavs)
+                        {
+                            changed = true;
+                            changedSeeAvs = true;
+                            changedoverlay = true;
+                            changedneedupdate = true;
+                            newLand.SeeAVs = newavs;
+                        }
                        break;
-                 }
-             }
-            World.LandChannel.UpdateLandObject(newLand.LocalID,newLand);
+                    case ScriptBaseClass.PARCEL_DETAILS_ANY_AVATAR_SOUNDS:
+                        bool newavsounds = (Convert.ToInt32(arg) != 0);
+                        if(newLand.AnyAVSounds != newavsounds)
+                        {
+                            changed = true;
+                            newLand.AnyAVSounds = newavsounds;
+                        }
+                        break;
+                    case ScriptBaseClass.PARCEL_DETAILS_GROUP_SOUNDS:
+                        bool newgrpsounds = (Convert.ToInt32(arg) != 0);
+                        if(newLand.GroupAVSounds != newgrpsounds)
+                        {
+                            changed = true;
+                            newLand.GroupAVSounds = newgrpsounds;
+                        }
+                        break;
+                    }
+            }
+            if(changed)
+            {
+                World.LandChannel.UpdateLandObject(newLand.LocalID, newLand);
+                if(changedneedupdate)
+                {
+                    UUID parcelID= newLand.GlobalID;
+                    World.ForEachRootScenePresence(delegate (ScenePresence avatar)
+                    {
+                        if (avatar == null || avatar.IsDeleted || avatar.IsInTransit)
+                            return;
+                        if(changedSeeAvs && avatar.currentParcelUUID == parcelID )
+                            avatar.currentParcelUUID = parcelID; // force parcel flags review
+                        if(avatar.ControllingClient == null)
+                            return;
+                        // this will be needed for some things like damage etc
+//                        if(avatar.currentParcelUUID == parcelID)
+//                            startLandObject.SendLandUpdateToClient(avatar.ControllingClient);
+                        if(changedoverlay && !avatar.IsNPC)
+                            World.LandChannel.SendParcelsOverlay(avatar.ControllingClient);
+                    });
+                }
+            }
        }
        public double osList2Double(LSL_Types.list src, int index)
@@ -1469,7 +1690,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // is not allowed to contain any.
            // This really should be removed.
            //
-            m_host.AddScriptLPS(1);
            if (index < 0)
            {
                index = src.Length + index;
@@ -1485,9 +1705,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            // What actually is the difference to the LL function?
            //
-            if (!CheckThreatLevel(ThreatLevel.VeryLow, "osSetParcelMediaURL"))  return;
+            CheckThreatLevel(ThreatLevel.VeryLow, "osSetParcelMediaURL");
-            m_host.AddScriptLPS(1);
            ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition);
@@ -1501,9 +1719,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            // What actually is the difference to the LL function?
            //
-            if (!CheckThreatLevel(ThreatLevel.VeryLow, "osSetParcelSIPAddress"))  return;
+            CheckThreatLevel(ThreatLevel.VeryLow, "osSetParcelSIPAddress");
-            m_host.AddScriptLPS(1);
            ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition);
@@ -1529,9 +1745,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            // that trigger engine-specific failures.
            // Besides, public grid users aren't supposed to know.
            //
-            // On the other hand, what other script engines are there?
+            // And yet, they get to choose the engine in their scripts.  Pfffft
-            //
+//            CheckThreatLevel(ThreatLevel.High, "osGetScriptEngineName");
-            m_host.AddScriptLPS(1);
            int scriptEngineNameIndex = 0;
@@ -1557,7 +1772,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer osCheckODE()
        {
-            m_host.AddScriptLPS(1);
            LSL_Integer ret = 0;    // false
            if (m_ScriptEngine.World.PhysicsScene != null)
            {
@@ -1580,22 +1794,46 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            //    about the physics engine, this function returns an empty string if
            //    the user does not have permission to see it. This as opposed to
            //    throwing an exception.
-            m_host.AddScriptLPS(1);
            string ret = String.Empty;
+//            if (String.IsNullOrEmpty(CheckThreatLevelTest(ThreatLevel.High, "osGetPhysicsEngineType")))
+            {
+                if (m_ScriptEngine.World.PhysicsScene != null)
+                {
+                    ret = m_ScriptEngine.World.PhysicsScene.EngineType;
+                    // An old physics engine might have an uninitialized engine type
+                    if (ret == null)
+                        ret = "unknown";
+                }
+            }
+            return ret;
+        }
+        public string osGetPhysicsEngineName()
+        {
+            CheckThreatLevel();
+            string ret = "NoEngine";
            if (m_ScriptEngine.World.PhysicsScene != null)
            {
-                ret = m_ScriptEngine.World.PhysicsScene.EngineType;
+                ret = m_ScriptEngine.World.PhysicsScene.EngineName;
                // An old physics engine might have an uninitialized engine type
                if (ret == null)
-                    ret = "unknown";
+                    ret = "UnknownEngine";
-            }
+                }
            return ret;
        }
        public string osGetSimulatorVersion()
        {
-            m_host.AddScriptLPS(1);
+            // High because it can be used to target attacks to known weaknesses
+            // This would allow a new class of griefer scripts that don't even
+            // require their user to know what they are doing (see script
+            // kiddie)
+            //
+            // Or they could check in the About window.  Pfffft
+//            CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion");
            return m_ScriptEngine.World.GetSimulatorVersion();
        }
@@ -1639,8 +1877,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public Object osParseJSONNew(string JSON)
        {
-            m_host.AddScriptLPS(1);
            try
            {
                OSD decoded = OSDParser.DeserializeJson(JSON);
@@ -1648,15 +1884,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            }
            catch(Exception e)
            {
-                OSSLError("osParseJSONNew: Problems decoding JSON string " + JSON + " : " + e.Message);
+                OSSLError("osParseJSONNew: Problems decoding JSON string " + JSON + " : " + e.Message) ;
                return null;
            }
        }
        public Hashtable osParseJSON(string JSON)
        {
-            m_host.AddScriptLPS(1);
            Object decoded = osParseJSONNew(JSON);
            if ( decoded is Hashtable ) {
@@ -1686,8 +1920,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <param name="message"></param>
        public void osMessageObject(LSL_Key objectUUID, string message)
        {
-            m_host.AddScriptLPS(1);
            UUID objUUID;
            if (!UUID.TryParse(objectUUID, out objUUID)) // prior to patching, a thrown exception regarding invalid GUID format would be shouted instead.
            {
@@ -1715,6 +1947,54 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    "dataserver", resobj, new DetectParams[0]));
        }
+        /// <summary>
+        /// Similar to llDie but given an object UUID
+        /// </summary>
+        /// <param name="objectUUID"></param>
+        public void osDie(LSL_Key objectUUID)
+        {
+//            CheckThreatLevel(ThreatLevel.VeryHigh, "osDie");
+            // if this is restricted to objects rezzed by this host level can be reduced
+//            CheckThreatLevel(ThreatLevel.Low, "osDie");
+            UUID objUUID;
+            if (!UUID.TryParse(objectUUID, out objUUID))
+            {
+                OSSLShoutError("osDie() cannot delete objects with invalid UUIDs");
+                return;
+            }
+            // harakiri check
+            if(objUUID == UUID.Zero)
+            {
+                if (!m_host.ParentGroup.IsAttachment)
+                    throw new SelfDeleteException();
+                return;
+            }
+            SceneObjectGroup sceneOG = World.GetSceneObjectGroup(objUUID);
+            if (sceneOG == null || sceneOG.IsDeleted)
+                return;
+            if(sceneOG.IsAttachment)
+                return;
+            if (sceneOG.OwnerID != m_host.OwnerID)
+                return;
+            // harakiri check
+            if(sceneOG.UUID == m_host.ParentGroup.UUID)
+                throw new SelfDeleteException();
+            // restrict to objects rezzed by host
+            if(sceneOG.RezzerID == m_host.ParentGroup.UUID)
+                World.DeleteSceneObject(sceneOG, false);
+        }
        /// <summary>
        /// Write a notecard directly to the prim's inventory.
        /// </summary>
@@ -1727,7 +2007,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <param name="contents">The contents of the notecard.</param>
        public void osMakeNotecard(string notecardName, LSL_Types.list contents)
        {
-            m_host.AddScriptLPS(1);
+//            CheckThreatLevel(ThreatLevel.High, "osMakeNotecard");
            StringBuilder notecardData = new StringBuilder();
@@ -1778,8 +2058,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            taskItem.ResetIDs(m_host.UUID);
            taskItem.ParentID = m_host.UUID;
            taskItem.CreationDate = (uint)Util.UnixTimeSinceEpoch();
-            taskItem.Name = asset.Name;
+            taskItem.Name = name;
-            taskItem.Description = asset.Description;
+            taskItem.Description = description;
            taskItem.Type = (int)AssetType.Notecard;
            taskItem.InvType = (int)InventoryType.Notecard;
            taskItem.OwnerID = m_host.OwnerID;
@@ -1799,6 +2079,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                m_host.Inventory.AddInventoryItemExclusive(taskItem, false);
            else
                m_host.Inventory.AddInventoryItem(taskItem, false);
+            m_host.ParentGroup.InvalidateDeepEffectivePerms();
            return taskItem;
        }
@@ -1843,15 +2124,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        {
            UUID assetID = UUID.Zero;
-            if (!UUID.TryParse(notecardNameOrUuid, out assetID))
+            bool notecardNameIsUUID = UUID.TryParse(notecardNameOrUuid, out assetID);
+            if (!notecardNameIsUUID)
            {
-                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
+                assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid);
-                {
-                    if (item.Type == 7 && item.Name == notecardNameOrUuid)
-                    {
-                        assetID = item.AssetID;
-                    }
-                }
            }
            if (assetID == UUID.Zero)
@@ -1862,13 +2139,43 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                AssetBase a = World.AssetService.Get(assetID.ToString());
                if (a == null)
-                    return UUID.Zero;
+                {
+                    // Whoops, it's still possible here that the notecard name was properly
+                    // formatted like a UUID but isn't an asset UUID so lets look it up by name after all
+                    assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid);
+                    if (assetID == UUID.Zero)
+                        return UUID.Zero;
+                    if (!NotecardCache.IsCached(assetID))
+                    {
+                        a = World.AssetService.Get(assetID.ToString());
+                        if (a == null)
+                        {
+                            return UUID.Zero;
+                        }
+                    }
+                }
                NotecardCache.Cache(assetID, a.Data);
            };
            return assetID;
        }
+        protected UUID SearchTaskInventoryForAssetId(string name)
+        {
+            UUID assetId = UUID.Zero;
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
+            {
+                if (item.Type == 7 && item.Name == name)
+                {
+                    assetId = item.AssetID;
+                }
+            }
+            m_host.TaskInventory.LockItemsForRead(false);
+            return assetId;
+        }
        /// <summary>
        /// Directly get an entire notecard at once.
@@ -1885,7 +2192,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns>Notecard line</returns>
        public string osGetNotecardLine(string name, int line)
        {
-            m_host.AddScriptLPS(1);
+//            CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNotecardLine");
            UUID assetID = CacheNotecard(name);
@@ -1912,7 +2219,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns>Notecard text</returns>
        public string osGetNotecard(string name)
        {
-            m_host.AddScriptLPS(1);
+//            CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNotecard");
            string text = LoadNotecard(name);
@@ -1941,7 +2248,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public int osGetNumberOfNotecardLines(string name)
        {
-            m_host.AddScriptLPS(1);
+//            CheckThreatLevel(ThreatLevel.VeryHigh, "osGetNumberOfNotecardLines");
            UUID assetID = CacheNotecard(name);
@@ -1956,8 +2263,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osAvatarName2Key(string firstname, string lastname)
        {
-            if (!CheckThreatLevel(ThreatLevel.Low, "osAvatarName2Key"))  return string.Empty;
+            CheckThreatLevel(ThreatLevel.Low, "osAvatarName2Key");
-            m_host.AddScriptLPS(1);
            IUserManagement userManager = World.RequestModuleInterface<IUserManagement>();
            if (userManager == null)
@@ -2008,8 +2314,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osKey2Name(string id)
        {
-            m_host.AddScriptLPS(1);
            UUID key = new UUID();
            if (UUID.TryParse(id, out key))
@@ -2117,8 +2421,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public string osGetGridNick()
        {
-////            if (!CheckThreatLevel(ThreatLevel.None, "osGetGridNick"))  return "";
+//            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridNick");
-            m_host.AddScriptLPS(1);
            string nick = String.Empty;
            IConfigSource config = m_ScriptEngine.ConfigSource;
@@ -2134,8 +2437,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetGridName()
        {
-////            if (!CheckThreatLevel(ThreatLevel.None, "osGetGridName"))  return "";
+//            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridName");
-            m_host.AddScriptLPS(1);
            string name = String.Empty;
            IConfigSource config = m_ScriptEngine.ConfigSource;
@@ -2151,8 +2453,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetGridLoginURI()
        {
-            if (!CheckThreatLevel(ThreatLevel.Moderate, "osGetGridLoginURI"))  return "";
+//            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridLoginURI");
-            m_host.AddScriptLPS(1);
            string loginURI = String.Empty;
            IConfigSource config = m_ScriptEngine.ConfigSource;
@@ -2168,11 +2469,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetGridHomeURI()
        {
-            if (!CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI"))  return "";
+//            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI");
-            m_host.AddScriptLPS(1);
            IConfigSource config = m_ScriptEngine.ConfigSource;
-            string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", 
+            string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI",
                new string[] { "Startup", "Hypergrid" }, String.Empty);
            if (!string.IsNullOrEmpty(HomeURI))
@@ -2190,8 +2490,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetGridGatekeeperURI()
        {
-            if (!CheckThreatLevel(ThreatLevel.Moderate, "osGetGridGatekeeperURI"))  return "";
+            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridGatekeeperURI");
-            m_host.AddScriptLPS(1);
            IConfigSource config = m_ScriptEngine.ConfigSource;
            string gatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
@@ -2201,16 +2500,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                return gatekeeperURI;
            // Legacy. Remove soon!
-            if (config.Configs["GridService"] != null)
+////            if (config.Configs["GridService"] != null)
-                gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI);
+////                gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI);
            return gatekeeperURI;
        }
        public string osGetGridCustom(string key)
        {
-            if (!CheckThreatLevel(ThreatLevel.Moderate, "osGetGridCustom"))  return String.Empty;
+//            CheckThreatLevel(ThreatLevel.Moderate, "osGetGridCustom");
-            m_host.AddScriptLPS(1);
            string retval = String.Empty;
            IConfigSource config = m_ScriptEngine.ConfigSource;
@@ -2226,8 +2524,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osGetAvatarHomeURI(string uuid)
        {
-            if (!CheckThreatLevel(ThreatLevel.Moderate, "osGetAvatarHomeURI"))  return "";
+//            CheckThreatLevel(ThreatLevel.Low, "osGetAvatarHomeURI");
-            m_host.AddScriptLPS(1);
            IUserManagement userManager = m_ScriptEngine.World.RequestModuleInterface<IUserManagement>();
            string returnValue = "";
@@ -2259,15 +2556,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_String osFormatString(string str, LSL_List strings)
        {
-            m_host.AddScriptLPS(1);
            return String.Format(str, strings.Data);
        }
        public LSL_List osMatchString(string src, string pattern, int start)
        {
-            m_host.AddScriptLPS(1);
            LSL_List result = new LSL_List();
            // Normalize indices (if negative).
@@ -2307,8 +2600,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_String osReplaceString(string src, string pattern, string replace, int count, int start)
        {
-            m_host.AddScriptLPS(1);
            // Normalize indices (if negative).
            // After normlaization they may still be
            // negative, but that is now relative to
@@ -2331,25 +2622,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public string osLoadedCreationDate()
        {
-            if (!CheckThreatLevel(ThreatLevel.Low, "osLoadedCreationDate"))  return "";
-            m_host.AddScriptLPS(1);
            return World.RegionInfo.RegionSettings.LoadedCreationDate;
        }
        public string osLoadedCreationTime()
        {
-            if (!CheckThreatLevel(ThreatLevel.Low, "osLoadedCreationTime"))  return "";
-            m_host.AddScriptLPS(1);
            return World.RegionInfo.RegionSettings.LoadedCreationTime;
        }
        public string osLoadedCreationID()
        {
-            if (!CheckThreatLevel(ThreatLevel.Low, "osLoadedCreationID"))  return "";
-            m_host.AddScriptLPS(1);
            return World.RegionInfo.RegionSettings.LoadedCreationID;
        }
@@ -2368,8 +2650,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osGetLinkPrimitiveParams"))  return new LSL_List();
+            CheckThreatLevel(ThreatLevel.VeryLow, "osGetLinkPrimitiveParams");
-            m_host.AddScriptLPS(1);
            InitLSL();
            // One needs to cast m_LSL_Api because we're using functions not
            // on the ILSL_Api interface.
@@ -2396,9 +2678,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osForceCreateLink(string target, int parent)
        {
-            if (!CheckThreatLevel(ThreatLevel.VeryLow, "osForceCreateLink"))  return;
+            CheckThreatLevel(ThreatLevel.VeryLow, "osForceCreateLink");
-            m_host.AddScriptLPS(1);
            InitLSL();
            ((LSL_Api)m_LSL_Api).CreateLink(target, parent);
@@ -2406,9 +2686,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osForceBreakLink(int linknum)
        {
-            if (!CheckThreatLevel(ThreatLevel.VeryLow, "osForceBreakLink"))  return;
+            CheckThreatLevel(ThreatLevel.VeryLow, "osForceBreakLink");
-            m_host.AddScriptLPS(1);
            InitLSL();
            ((LSL_Api)m_LSL_Api).BreakLink(linknum);
@@ -2416,9 +2694,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osForceBreakAllLinks()
        {
-            if (!CheckThreatLevel(ThreatLevel.VeryLow, "osForceBreakAllLinks"))  return;
+            CheckThreatLevel(ThreatLevel.VeryLow, "osForceBreakAllLinks");
-            m_host.AddScriptLPS(1);
            InitLSL();
            ((LSL_Api)m_LSL_Api).BreakAllLinks();
@@ -2426,8 +2702,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer osIsNpc(LSL_Key npc)
        {
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
            {
@@ -2442,31 +2716,99 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcCreate"))  return new LSL_Key(ScriptBaseClass.NULL_KEY);
+            CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
-            m_host.AddScriptLPS(1);
+            // have to get the npc module also here to set the default Not Owned
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if(module == null)
+                return new LSL_Key(UUID.Zero.ToString());
+            bool owned = (module.NPCOptionFlags & NPCOptionsFlags.AllowNotOwned) == 0;
-            return NpcCreate(firstname, lastname, position, notecard, false, false);
+            return NpcCreate(firstname, lastname, position, notecard, owned, false, false);
        }
        public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcCreate"))  return new LSL_Key(ScriptBaseClass.NULL_KEY);
+            CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
-            m_host.AddScriptLPS(1);
            return NpcCreate(
                firstname, lastname, position, notecard,
                (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0,
-                (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0);
+                (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0,
+                (options & ScriptBaseClass.OS_NPC_OBJECT_GROUP) != 0);
        }
        private LSL_Key NpcCreate(
-            string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent)
+            string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent, bool hostGroupID)
        {
+            if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z)))
+            {
+                OSSLError("no permission to rez NPC at requested location");
+                return new LSL_Key(UUID.Zero.ToString());
+            }
            INPCModule module = World.RequestModuleInterface<INPCModule>();
-            if (module != null)
+            if(module == null)
+            {
+                OSSLError("NPC module not enabled");
+                return new LSL_Key(UUID.Zero.ToString());
+            }
+            string groupTitle = String.Empty;
+            UUID groupID = UUID.Zero;
+            AvatarAppearance appearance = null;
+            // check creation options
+            NPCOptionsFlags createFlags = module.NPCOptionFlags;
+            if((createFlags & NPCOptionsFlags.AllowNotOwned) == 0 && !owned)
+            {
+                OSSLError("Not owned NPCs disabled");
+                owned = true; // we should get here...
+            }
+            if((createFlags & NPCOptionsFlags.AllowSenseAsAvatar) == 0 && senseAsAgent)
+            {
+                OSSLError("NPC allow sense as Avatar disabled");
+                senseAsAgent = false;
+            }
+            if(hostGroupID && m_host.GroupID != UUID.Zero)
            {
-                AvatarAppearance appearance = null;
+                IGroupsModule groupsModule = m_ScriptEngine.World.RequestModuleInterface<IGroupsModule>();
+                if (groupsModule != null)
+                {
+                    GroupMembershipData member = groupsModule.GetMembershipData(m_host.GroupID, m_host.OwnerID);
+                    if (member == null)
+                    {
+                        OSSLError(string.Format("osNpcCreate: the object owner is not member of the object group"));
+                        return new LSL_Key(UUID.Zero.ToString());
+                    }
+                    groupID = m_host.GroupID;
+                    if((createFlags & NPCOptionsFlags.NoNPCGroup) != 0)
+                    {
+                        GroupRecord grprec = groupsModule.GetGroupRecord(m_host.GroupID);
+                        if(grprec != null && grprec.GroupName != "")
+                            groupTitle = grprec.GroupName;
+                    }
+                }
+            }
+            if((createFlags & NPCOptionsFlags.NoNPCGroup) == 0)
+            {
+                if (firstname != String.Empty || lastname != String.Empty)
+                {
+                    if (firstname != "Shown outfit:")
+                        groupTitle = "- NPC -";
+                }
+            }
+            if((createFlags & NPCOptionsFlags.AllowCloneOtherAvatars) != 0)
+            {
                UUID id;
                if (UUID.TryParse(notecard, out id))
                {
@@ -2474,38 +2816,52 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    if (clonePresence != null)
                        appearance = clonePresence.Appearance;
                }
+            }
-                if (appearance == null)
+            if (appearance == null)
-                {
+            {
-                    string appearanceSerialized = LoadNotecard(notecard);
+                string appearanceSerialized = LoadNotecard(notecard);
-                    if (appearanceSerialized != null)
+                if (appearanceSerialized != null)
+                {
+                    try
                    {
                        OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
                        appearance = new AvatarAppearance();
                        appearance.Unpack(appearanceOsd);
                    }
-                    else
+                    catch
                    {
-                        OSSLError(string.Format("osNpcCreate: Notecard reference '{0}' not found.", notecard));
+                        OSSLError(string.Format("osNpcCreate: Error processing notcard '{0}'", notecard));
+                        return new LSL_Key(UUID.Zero.ToString());
                    }
                }
+            else
+                {
+                    OSSLError(string.Format("osNpcCreate: Notecard reference '{0}' not found.", notecard));
+                }
+            }
-                UUID ownerID = UUID.Zero;
+            UUID ownerID = UUID.Zero;
-                if (owned)
+            if (owned)
-                    ownerID = m_host.OwnerID;
+                ownerID = m_host.OwnerID;
-                UUID x = module.CreateNPC(firstname,
+            UUID x = module.CreateNPC(firstname,
-                                          lastname,
+                                      lastname,
-                                          position,
+                                      position,
-                                          ownerID,
+                                      UUID.Random(),
-                                          senseAsAgent,
+                                      ownerID,
-                                          World,
+                                      groupTitle,
-                                          appearance);
+                                      groupID,
+                                      senseAsAgent,
+                                      World,
+                                      appearance);
-                return new LSL_Key(x.ToString());
+            ScenePresence sp;
+            if (World.TryGetScenePresence(x, out sp))
+            {
+                sp.SendAvatarDataToAllAgents();
            }
+            return new LSL_Key(x.ToString());
-            return new LSL_Key(UUID.Zero.ToString());
        }
        /// <summary>
@@ -2516,9 +2872,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns>The asset ID of the notecard saved.</returns>
        public LSL_Key osNpcSaveAppearance(LSL_Key npc, string notecard)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcSaveAppearance"))  return new LSL_Key(ScriptBaseClass.NULL_KEY);
-            m_host.AddScriptLPS(1);
            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
            if (npcModule != null)
@@ -2538,9 +2891,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcLoadAppearance(LSL_Key npc, string notecard)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcLoadAppearance"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
            if (npcModule != null)
@@ -2570,8 +2920,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Key osNpcGetOwner(LSL_Key npc)
        {
-            m_host.AddScriptLPS(1);
            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
            if (npcModule != null)
            {
@@ -2591,8 +2939,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Vector osNpcGetPos(LSL_Key npc)
        {
-            m_host.AddScriptLPS(1);
            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
            if (npcModule != null)
            {
@@ -2614,9 +2960,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcMoveTo(LSL_Key npc, LSL_Vector pos)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcMoveTo"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
            {
@@ -2633,9 +2976,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcMoveToTarget(LSL_Key npc, LSL_Vector target, int options)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcMoveToTarget"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
            {
@@ -2658,8 +2998,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Rotation osNpcGetRot(LSL_Key npc)
        {
-            m_host.AddScriptLPS(1);
            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
            if (npcModule != null)
            {
@@ -2681,9 +3019,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcSetRot(LSL_Key npc, LSL_Rotation rotation)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcSetRot"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule npcModule = World.RequestModuleInterface<INPCModule>();
            if (npcModule != null)
            {
@@ -2703,9 +3038,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcStopMoveToTarget(LSL_Key npc)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcStopMoveToTarget"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
            {
@@ -2718,6 +3050,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            }
        }
+        public void osNpcSetProfileAbout(LSL_Key npc, string about)
+        {
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                UUID npcId = new UUID(npc.m_string);
+                if (!module.CheckPermissions(npcId, m_host.OwnerID))
+                    return;
+                ScenePresence sp = World.GetScenePresence(npcId);
+                if (sp != null)
+                    ((INPC)(sp.ControllingClient)).profileAbout = about;
+            }
+        }
+        public void osNpcSetProfileImage(LSL_Key npc, string image)
+        {
+            INPCModule module = World.RequestModuleInterface<INPCModule>();
+            if (module != null)
+            {
+                UUID npcId = new UUID(npc.m_string);
+                if (!module.CheckPermissions(npcId, m_host.OwnerID))
+                    return;
+                UUID ImageID = new UUID();
+                ImageID = ScriptUtils.GetAssetIdFromItemName(m_host, image, (int)AssetType.Texture);
+                if (ImageID == null || ImageID == UUID.Zero)
+                {
+                    if (!UUID.TryParse(image, out ImageID))
+                        return;
+                }
+                ScenePresence sp = World.GetScenePresence(npcId);
+                if (sp != null)
+                    ((INPC)(sp.ControllingClient)).profileImage = ImageID;
+            }
+        }
        public void osNpcSay(LSL_Key npc, string message)
        {
            osNpcSay(npc, 0, message);
@@ -2725,9 +3099,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcSay(LSL_Key npc, int channel, string message)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcSay"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
            {
@@ -2742,9 +3113,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcShout(LSL_Key npc, int channel, string message)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcShout"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
            {
@@ -2759,9 +3127,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcSit(LSL_Key npc, LSL_Key target, int options)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcSit"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
            {
@@ -2776,9 +3141,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcStand(LSL_Key npc)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcStand"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
            {
@@ -2793,26 +3155,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcRemove(LSL_Key npc)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcRemove"))  return;
+            try
-            m_host.AddScriptLPS(1);
-            INPCModule module = World.RequestModuleInterface<INPCModule>();
-            if (module != null)
            {
-                UUID npcId = new UUID(npc.m_string);
+                INPCModule module = World.RequestModuleInterface<INPCModule>();
+                if (module != null)
+                {
+                    UUID npcId = new UUID(npc.m_string);
-                if (!module.CheckPermissions(npcId, m_host.OwnerID))
+                    if (!module.CheckPermissions(npcId, m_host.OwnerID))
-                    return;
+                        return;
-                module.DeleteNPC(npcId, World);
+                    module.DeleteNPC(npcId, World);
+                }
            }
+            catch { }
        }
        public void osNpcPlayAnimation(LSL_Key npc, string animation)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcPlayAnimation"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
            {
@@ -2825,9 +3185,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcStopAnimation(LSL_Key npc, string animation)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcStopAnimation"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
            {
@@ -2840,9 +3197,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcWhisper(LSL_Key npc, int channel, string message)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcWhisper"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            if (module != null)
            {
@@ -2857,9 +3211,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osNpcTouch(LSL_Key npcLSL_Key, LSL_Key object_key, LSL_Integer link_num)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osNpcTouch"))  return;
-            m_host.AddScriptLPS(1);
            INPCModule module = World.RequestModuleInterface<INPCModule>();
            int linkNum = link_num.value;
            if (module != null || (linkNum < 0 && linkNum != ScriptBaseClass.LINK_THIS))
@@ -2902,16 +3253,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns>The asset ID of the notecard saved.</returns>
        public LSL_Key osOwnerSaveAppearance(string notecard)
        {
-            if (!CheckThreatLevel(ThreatLevel.Moderate, "osOwnerSaveAppearance"))  return new LSL_Key(ScriptBaseClass.NULL_KEY);
-            m_host.AddScriptLPS(1);
            return SaveAppearanceToNotecard(m_host.OwnerID, notecard);
        }
        public LSL_Key osAgentSaveAppearance(LSL_Key avatarId, string notecard)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osAgentSaveAppearance"))  return new LSL_Key(ScriptBaseClass.NULL_KEY);
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osAgentSaveAppearance");
-            m_host.AddScriptLPS(1);
            return SaveAppearanceToNotecard(avatarId, notecard);
        }
@@ -2923,7 +3270,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (appearanceModule != null)
            {
                appearanceModule.SaveBakedTextures(sp.UUID);
-                OSDMap appearancePacked = sp.Appearance.Pack();
+                EntityTransferContext ctx = new EntityTransferContext();
+                OSDMap appearancePacked = sp.Appearance.Pack(ctx);
                TaskInventoryItem item
                    = SaveNotecard(notecard, "Avatar Appearance", Util.GetFormattedXml(appearancePacked as OSD), true);
@@ -2962,8 +3310,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns>"male" or "female" or "unknown"</returns>
        public LSL_String osGetGender(LSL_Key rawAvatarId)
        {
-            m_host.AddScriptLPS(1);
            UUID avatarId;
            if (!UUID.TryParse(rawAvatarId, out avatarId))
                return new LSL_String("unknown");
@@ -3005,8 +3351,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public LSL_Key osGetMapTexture()
        {
-            m_host.AddScriptLPS(1);
            return m_ScriptEngine.World.RegionInfo.RegionSettings.TerrainImageID.ToString();
        }
@@ -3017,8 +3361,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public LSL_Key osGetRegionMapTexture(string regionName)
        {
-            m_host.AddScriptLPS(1);
            Scene scene = m_ScriptEngine.World;
            UUID key = UUID.Zero;
            GridRegion region;
@@ -3045,7 +3387,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns>List of floats</returns>
        public LSL_List osGetRegionStats()
        {
-            m_host.AddScriptLPS(1);
+            CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats");
            LSL_List ret = new LSL_List();
            float[] stats = World.StatsReporter.LastReportedSimStats;
@@ -3058,32 +3401,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Vector osGetRegionSize()
        {
-            m_host.AddScriptLPS(1);
+            Scene scene = m_ScriptEngine.World;
+            RegionInfo reg =  World.RegionInfo;
-            bool isMegaregion;
+//            GridRegion region = scene.GridService.GetRegionByUUID(UUID.Zero, World.RegionInfo.RegionID);
-            IRegionCombinerModule rcMod = World.RequestModuleInterface<IRegionCombinerModule>();
+//            return new LSL_Vector((float)region.RegionSizeX, (float)region.RegionSizeY, (float)Constants.RegionHeight);
-            if (rcMod != null)
+            return new LSL_Vector((float)reg.RegionSizeX, (float)reg.RegionSizeY, 0.0f);
-                isMegaregion = rcMod.IsRootForMegaregion(World.RegionInfo.RegionID);
-            else
-                isMegaregion = false;
-            if (isMegaregion)
-            {
-                Vector2 size = rcMod.GetSizeOfMegaregion(World.RegionInfo.RegionID);
-                return new LSL_Vector(size.X, size.Y, Constants.RegionHeight);
-            }
-            else
-            {
-                Scene scene = m_ScriptEngine.World;
-                GridRegion region = scene.GridService.GetRegionByUUID(UUID.Zero, World.RegionInfo.RegionID);
-                return new LSL_Vector((float)region.RegionSizeX, (float)region.RegionSizeX, Constants.RegionHeight);
-            }
        }
        public int osGetSimulatorMemory()
        {
-            if (!CheckThreatLevel(ThreatLevel.Moderate, "osGetSimulatorMemory"))  return 0;
+            CheckThreatLevel(ThreatLevel.Moderate, "osGetSimulatorMemory");
-            m_host.AddScriptLPS(1);
            long pws = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64;
            if (pws > Int32.MaxValue)
@@ -3094,10 +3422,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            return (int)pws;
        }
+        public int osGetSimulatorMemoryKB()
+        {
+            CheckThreatLevel(ThreatLevel.Moderate, "osGetSimulatorMemoryKB");
+            long pws = System.Diagnostics.Process.GetCurrentProcess().WorkingSet64;
+            if((pws & 0x3FFL) != 0)
+                pws += 0x400L;
+            pws >>= 10;
+            if (pws > Int32.MaxValue)
+                return Int32.MaxValue;
+            return (int)pws;
+        }
        public void osSetSpeed(string UUID, LSL_Float SpeedModifier)
        {
-            if (!CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"))  return;
+            CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed");
-            m_host.AddScriptLPS(1);
            ScenePresence avatar = World.GetScenePresence(new UUID(UUID));
            if (avatar != null)
@@ -3106,8 +3450,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osKickAvatar(string FirstName, string SurName, string alert)
        {
-            if (!CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"))  return;
+            CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
-            m_host.AddScriptLPS(1);
            World.ForEachRootScenePresence(delegate(ScenePresence sp)
            {
@@ -3125,23 +3468,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Float osGetHealth(string avatar)
        {
-            m_host.AddScriptLPS(1);
            LSL_Float health = new LSL_Float(-1);
            ScenePresence presence = World.GetScenePresence(new UUID(avatar));
-            if (presence != null) health = presence.Health;
+            if (presence != null)
+                health = presence.Health;
            return health;
        }
        public void osCauseDamage(string avatar, double damage)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osCauseDamage"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osCauseDamage");
-            m_host.AddScriptLPS(1);
            UUID avatarId = new UUID(avatar);
            Vector3 pos = m_host.GetWorldPosition();
-            ScenePresence presence = World.GetScenePresence(avatarId); 
+            ScenePresence presence = World.GetScenePresence(avatarId);
            if (presence != null)
            {
                LandData land = World.GetLandData(pos);
@@ -3163,13 +3504,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osCauseHealing(string avatar, double healing)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osCauseHealing"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osCauseHealing");
-            m_host.AddScriptLPS(1);
            UUID avatarId = new UUID(avatar);
            ScenePresence presence = World.GetScenePresence(avatarId);
-            if (presence != null && World.ScriptDanger(m_host.LocalId, m_host.GetWorldPosition()))
+            if (presence != null)
            {
                float health = presence.Health;
                health += (float)healing;
@@ -3181,31 +3521,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            }
        }
+        public void osSetHealth(string avatar, double health)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osSetHealth");
+            UUID avatarId = new UUID(avatar);
+            ScenePresence presence = World.GetScenePresence(avatarId);
+            if (presence != null)
+            {
+                if (health > 100.0)
+                    health = 100.0;
+                else if (health < 1.0)
+                    health = 1.0;
+                presence.setHealthWithUpdate((float)health);
+            }
+        }
+        public void osSetHealRate(string avatar, double healrate)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osSetHealRate");
+            UUID avatarId = new UUID(avatar);
+            ScenePresence presence = World.GetScenePresence(avatarId);
+            if (presence != null)
+                 presence.HealRate = (float)healrate;
+        }
+        public LSL_Float osGetHealRate(string avatar)
+        {
+            LSL_Float rate = new LSL_Float(0);
+            ScenePresence presence = World.GetScenePresence(new UUID(avatar));
+            if (presence != null)
+                rate = presence.HealRate;
+            return rate;
+        }
        public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osGetPrimitiveParams"))  return new LSL_List();
+            CheckThreatLevel(ThreatLevel.High, "osGetPrimitiveParams");
-            m_host.AddScriptLPS(1);
-            InitLSL();
+            InitLSL();
            return m_LSL_Api.GetPrimitiveParamsEx(prim, rules);
        }
        public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osSetPrimitiveParams"))  return;
+            CheckThreatLevel(ThreatLevel.VeryLow, "osSetPrimitiveParams");
-            m_host.AddScriptLPS(1);
-            InitLSL();
+            InitLSL();
            m_LSL_Api.SetPrimitiveParamsEx(prim, rules, "osSetPrimitiveParams");
        }
        /// <summary>
-        /// Set parameters for light projection in host prim 
+        /// Set parameters for light projection in host prim
        /// </summary>
        public void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osSetProjectionParams"))  return;
            osSetProjectionParams(UUID.Zero.ToString(), projection, texture, fov, focus, amb);
        }
@@ -3214,8 +3588,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// </summary>
        public void osSetProjectionParams(LSL_Key prim, bool projection, LSL_Key texture, double fov, double focus, double amb)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osSetProjectionParams"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osSetProjectionParams");
-            m_host.AddScriptLPS(1);
            SceneObjectPart obj = null;
            if (prim == UUID.Zero.ToString())
@@ -3245,12 +3618,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns>Strided list of the UUID, position and name of each avatar in the region</returns>
        public LSL_List osGetAvatarList()
        {
-            m_host.AddScriptLPS(1);
+            LSL_List result = new LSL_List();
+            World.ForEachRootScenePresence(delegate (ScenePresence avatar)
+            {
+                if (avatar != null && !avatar.IsDeleted && avatar.UUID != m_host.OwnerID )
+                {
+                    result.Add(new LSL_String(avatar.UUID.ToString()));
+                    result.Add(new LSL_Vector(avatar.AbsolutePosition));
+                    result.Add(new LSL_String(avatar.Name));
+                }
+            });
+            return result;
+        }
+        public LSL_List osGetNPCList()
+        {
            LSL_List result = new LSL_List();
            World.ForEachRootScenePresence(delegate (ScenePresence avatar)
            {
-                if (avatar != null && avatar.UUID != m_host.OwnerID)
+                // npcs are not childagents but that is now.
+                if (avatar != null && avatar.IsNPC && !avatar.IsDeleted && !avatar.IsChildAgent && !avatar.IsInTransit)
                {
                    result.Add(new LSL_String(avatar.UUID.ToString()));
                    result.Add(new LSL_Vector(avatar.AbsolutePosition));
@@ -3268,8 +3656,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public LSL_String osUnixTimeToTimestamp(long time)
        {
-            m_host.AddScriptLPS(1);
            long baseTicks = 621355968000000000;
            long tickResolution = 10000000;
            long epochTicks = (time * tickResolution) + baseTicks;
@@ -3282,11 +3668,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// Get the description from an inventory item
        /// </summary>
        /// <param name="inventoryName"></param>
-        /// <returns>Item description</returns>  
+        /// <returns>Item description</returns>
        public LSL_String osGetInventoryDesc(string item)
        {
-            m_host.AddScriptLPS(1);
            lock (m_host.TaskInventory)
            {
                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
@@ -3308,8 +3692,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public LSL_Integer osInviteToGroup(LSL_Key agentId)
        {
-            if (!CheckThreatLevel(ThreatLevel.VeryLow, "osInviteToGroup"))  return ScriptBaseClass.FALSE;
+            CheckThreatLevel(ThreatLevel.VeryLow, "osInviteToGroup");
-            m_host.AddScriptLPS(1);
            UUID agent = new UUID(agentId);
@@ -3343,8 +3726,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public LSL_Integer osEjectFromGroup(LSL_Key agentId)
        {
-            if (!CheckThreatLevel(ThreatLevel.VeryLow, "osEjectFromGroup"))  return ScriptBaseClass.FALSE;
+            CheckThreatLevel(ThreatLevel.VeryLow, "osEjectFromGroup");
-            m_host.AddScriptLPS(1);
            UUID agent = new UUID(agentId);
@@ -3378,9 +3760,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public void osSetTerrainTexture(int level, LSL_Key texture)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osSetTerrainTexture"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osSetTerrainTexture");
-            m_host.AddScriptLPS(1);
            //Check to make sure that the script's owner is the estate manager/master
            //World.Permissions.GenericEstatePermission(
            if (World.Permissions.IsGod(m_host.OwnerID))
@@ -3408,9 +3789,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public void osSetTerrainTextureHeight(int corner, double low, double high)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osSetTerrainTextureHeight"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osSetTerrainTextureHeight");
-            m_host.AddScriptLPS(1);
            //Check to make sure that the script's owner is the estate manager/master
            //World.Permissions.GenericEstatePermission(
            if (World.Permissions.IsGod(m_host.OwnerID))
@@ -3429,9 +3809,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osForceAttachToAvatar(int attachmentPoint)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osForceAttachToAvatar"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osForceAttachToAvatar");
-            m_host.AddScriptLPS(1);
            InitLSL();
            ((LSL_Api)m_LSL_Api).AttachToAvatar(attachmentPoint);
@@ -3439,18 +3817,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osForceAttachToAvatarFromInventory(string itemName, int attachmentPoint)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osForceAttachToAvatarFromInventory"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osForceAttachToAvatarFromInventory");
-            m_host.AddScriptLPS(1);
            ForceAttachToAvatarFromInventory(m_host.OwnerID, itemName, attachmentPoint);
        }
        public void osForceAttachToOtherAvatarFromInventory(string rawAvatarId, string itemName, int attachmentPoint)
        {
-            if (!CheckThreatLevel(ThreatLevel.Severe, "osForceAttachToOtherAvatarFromInventory"))  return;
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osForceAttachToOtherAvatarFromInventory");
-            m_host.AddScriptLPS(1);
            UUID avatarId;
@@ -3480,7 +3854,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            if (item.InvType != (int)InventoryType.Object)
            {
                // FIXME: Temporary null check for regression tests since they dont' have the infrastructure to set
-                // up the api reference.  
+                // up the api reference.
                if (m_LSL_Api != null)
                    ((LSL_Api)m_LSL_Api).llSay(0, string.Format("Unable to attach, item '{0}' is not an object.", itemName));
@@ -3509,9 +3883,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osForceDetachFromAvatar()
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osForceDetachFromAvatar"))  return;
+            CheckThreatLevel(ThreatLevel.VeryHigh, "osForceDetachFromAvatar");
-            m_host.AddScriptLPS(1);
            InitLSL();
            ((LSL_Api)m_LSL_Api).DetachFromAvatar();
@@ -3519,9 +3891,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_List osGetNumberOfAttachments(LSL_Key avatar, LSL_List attachmentPoints)
        {
-            if (!CheckThreatLevel(ThreatLevel.Moderate, "osGetNumberOfAttachments"))  return new LSL_List();
+            CheckThreatLevel(ThreatLevel.Moderate, "osGetNumberOfAttachments");
-            m_host.AddScriptLPS(1);
            UUID targetUUID;
            ScenePresence target;
@@ -3555,15 +3925,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osMessageAttachments(LSL_Key avatar, string message, LSL_List attachmentPoints, int options)
        {
-            if (!CheckThreatLevel(ThreatLevel.Moderate, "osMessageAttachments"))  return;
+            CheckThreatLevel(ThreatLevel.Moderate, "osMessageAttachments");
-            m_host.AddScriptLPS(1);
            UUID targetUUID;
+            if(!UUID.TryParse(avatar.ToString(), out targetUUID))
+                return;
+            if(targetUUID == UUID.Zero)
+                return;
            ScenePresence target;
+            if(!World.TryGetScenePresence(targetUUID, out target))
+               return;
-            if (attachmentPoints.Length >= 1 && UUID.TryParse(avatar.ToString(), out targetUUID) && World.TryGetScenePresence(targetUUID, out target))
+            if(target.IsDeleted || target.IsInTransit)
+               return;
+            List<int> aps = new List<int>();
+            if(attachmentPoints.Length != 0)
            {
-                List<int> aps = new List<int>();
                foreach (object point in attachmentPoints.Data)
                {
                    int ipoint;
@@ -3572,115 +3952,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                        aps.Add(ipoint);
                    }
                }
+                // parsing failed
+                if(aps.Count != attachmentPoints.Length)
+                    return;
+            }
-                List<SceneObjectGroup> attachments = new List<SceneObjectGroup>();
+            List<SceneObjectGroup> attachments = new List<SceneObjectGroup>();
-                bool msgAll = aps.Contains(ScriptBaseClass.OS_ATTACH_MSG_ALL);
-                bool invertPoints = (options & ScriptBaseClass.OS_ATTACH_MSG_INVERT_POINTS) != 0;
-                if (msgAll && invertPoints)
+            bool msgAll;
-                {
+            bool invertPoints = (options & ScriptBaseClass.OS_ATTACH_MSG_INVERT_POINTS) != 0;
-                    return;
-                }
-                else if (msgAll || invertPoints)
-                {
-                    attachments = target.GetAttachments();
-                }
-                else
-                {
-                    foreach (int point in aps)
-                    {
-                        if (point > 0)
-                        {
-                            attachments.AddRange(target.GetAttachments((uint)point));
-                        }
-                    }
-                }
-                // if we have no attachments at this point, exit now
+            if(aps.Count == 0)
-                if (attachments.Count == 0)
+            {
-                {
+                if(!invertPoints)
                    return;
-                }
+                msgAll = true;
+                invertPoints = false;
+            }
+            else
+                msgAll = aps.Contains(ScriptBaseClass.OS_ATTACH_MSG_ALL);
-                List<SceneObjectGroup> ignoreThese = new List<SceneObjectGroup>();
+            if (msgAll && invertPoints)
+                return;
-                if (invertPoints)
+            if (msgAll || invertPoints)
+            {
+                attachments = target.GetAttachments();
+            }
+            else
+            {
+                foreach (int point in aps)
                {
-                    foreach (SceneObjectGroup attachment in attachments)
+                    if (point > 0)
                    {
-                        if (aps.Contains((int)attachment.AttachmentPoint))
+                        attachments.AddRange(target.GetAttachments((uint)point));
-                        {
-                            ignoreThese.Add(attachment);
-                        }
                    }
                }
+            }
-                foreach (SceneObjectGroup attachment in ignoreThese)
+            // if we have no attachments at this point, exit now
-                {
+            if (attachments.Count == 0)
-                    attachments.Remove(attachment);
+            {
-                }
+                return;
-                ignoreThese.Clear();
+            }
-                // if inverting removed all attachments to check, exit now
+            bool optionObjCreator = (options &
-                if (attachments.Count < 1)
+                        ScriptBaseClass.OS_ATTACH_MSG_OBJECT_CREATOR) != 0;
-                {
+            bool optionScriptCreator = (options &
-                    return;
+                        ScriptBaseClass.OS_ATTACH_MSG_SCRIPT_CREATOR) != 0;
-                }
-                if ((options & ScriptBaseClass.OS_ATTACH_MSG_OBJECT_CREATOR) != 0)
+            UUID hostCreatorID = m_host.CreatorID;
-                {
+            UUID itemCreatorID = m_item.CreatorID;
-                    foreach (SceneObjectGroup attachment in attachments)
-                    {
-                        if (attachment.RootPart.CreatorID != m_host.CreatorID)
-                        {
-                            ignoreThese.Add(attachment);
-                        }
-                    }
-                    foreach (SceneObjectGroup attachment in ignoreThese)
+            foreach (SceneObjectGroup sog in attachments)
-                    {
+            {
-                        attachments.Remove(attachment);
+                if(sog.IsDeleted || sog.inTransit)
-                    }
+                    continue;
-                    ignoreThese.Clear();
-                    // if filtering by same object creator removed all
-                    //  attachments to check, exit now
-                    if (attachments.Count == 0)
-                    {
-                        return;
-                    }
-                }
-                if ((options & ScriptBaseClass.OS_ATTACH_MSG_SCRIPT_CREATOR) != 0)
+                if (invertPoints && aps.Contains((int)sog.AttachmentPoint))
-                {
+                    continue;
-                    foreach (SceneObjectGroup attachment in attachments)
-                    {
-                        if (attachment.RootPart.CreatorID != m_item.CreatorID)
-                        {
-                            ignoreThese.Add(attachment);
-                        }
-                    }
-                    foreach (SceneObjectGroup attachment in ignoreThese)
+                UUID CreatorID = sog.RootPart.CreatorID;
-                    {
+                if (optionObjCreator && CreatorID != hostCreatorID)
-                        attachments.Remove(attachment);
+                    continue;
-                    }
-                    ignoreThese.Clear();
-                    // if filtering by object creator must match originating
+                if (optionScriptCreator && CreatorID != itemCreatorID)
-                    //  script creator removed all attachments to check,
+                    continue;
-                    //  exit now
-                    if (attachments.Count == 0)
-                    {
-                        return;
-                    }
-                }
-                foreach (SceneObjectGroup attachment in attachments)
+                SceneObjectPart[] parts = sog.Parts;
-                {
+                foreach(SceneObjectPart p in parts)
-                    MessageObject(attachment.RootPart.UUID, message);
+                    MessageObject(p.UUID, message);
-                }
            }
        }
@@ -3693,8 +4034,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns>1 if thing is a valid UUID, 0 otherwise</returns>
        public LSL_Integer osIsUUID(string thing)
        {
-            m_host.AddScriptLPS(1);
            UUID test;
            return UUID.TryParse(thing, out test) ? 1 : 0;
        }
@@ -3707,8 +4046,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public LSL_Float osMin(double a, double b)
        {
-            m_host.AddScriptLPS(1);
            return Math.Min(a, b);
        }
@@ -3720,16 +4057,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public LSL_Float osMax(double a, double b)
        {
-            m_host.AddScriptLPS(1);
            return Math.Max(a, b);
        }
        public LSL_Key osGetRezzingObject()
        {
-            m_host.AddScriptLPS(1);
+            UUID rezID = m_host.ParentGroup.RezzerID;
+            if(rezID == UUID.Zero || m_host.ParentGroup.Scene.GetScenePresence(rezID) != null)
-            return new LSL_Key(m_host.ParentGroup.FromPartID.ToString());
+                return new LSL_Key(UUID.Zero.ToString());
+            return new LSL_Key(rezID.ToString());
        }
        /// <summary>
@@ -3738,7 +4074,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns></returns>
        public void osSetContentType(LSL_Key id, string type)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osSetContentType"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osSetContentType");
            if (m_UrlModule != null)
                m_UrlModule.HttpContentType(new UUID(id),type);
@@ -3750,7 +4086,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        /// <returns>boolean indicating whether an error was shouted.</returns>
        protected bool ShoutErrorOnLackingOwnerPerms(int perms, string errorPrefix)
        {
-            m_host.AddScriptLPS(1);
            bool fail = false;
            if (m_item.PermsGranter != m_host.OwnerID)
            {
@@ -3800,39 +4135,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void osDropAttachment()
        {
-            if (!CheckThreatLevel(ThreatLevel.Low, "osDropAttachment"))  return;
+            CheckThreatLevel(ThreatLevel.Moderate, "osDropAttachment");
-            m_host.AddScriptLPS(1);
            DropAttachment(true);
        }
        public void osForceDropAttachment()
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osForceDropAttachment"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osForceDropAttachment");
-            m_host.AddScriptLPS(1);
            DropAttachment(false);
        }
        public void osDropAttachmentAt(LSL_Vector pos, LSL_Rotation rot)
        {
-            if (!CheckThreatLevel(ThreatLevel.Low, "osDropAttachmentAt"))  return;
+            CheckThreatLevel(ThreatLevel.Moderate, "osDropAttachmentAt");
-            m_host.AddScriptLPS(1);
            DropAttachmentAt(true, pos, rot);
        }
        public void osForceDropAttachmentAt(LSL_Vector pos, LSL_Rotation rot)
        {
-            if (!CheckThreatLevel(ThreatLevel.High, "osForceDropAttachmentAt"))  return;
+            CheckThreatLevel(ThreatLevel.High, "osForceDropAttachmentAt");
-            m_host.AddScriptLPS(1);
            DropAttachmentAt(false, pos, rot);
        }
        public LSL_Integer osListenRegex(int channelID, string name, string ID, string msg, int regexBitfield)
        {
-            m_host.AddScriptLPS(1);
            UUID keyID;
            UUID.TryParse(ID, out keyID);
@@ -3879,7 +4209,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Integer osRegexIsMatch(string input, string pattern)
        {
-            m_host.AddScriptLPS(1);
            try
            {
                return Regex.IsMatch(input, pattern) ? 1 : 0;
@@ -3890,5 +4219,376 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                return 0;
            }
        }
+        public LSL_String osRequestURL(LSL_List options)
+        {
+            CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL");
+            Hashtable opts = new Hashtable();
+            for (int i = 0 ; i < options.Length ; i++)
+            {
+                object opt = options.Data[i];
+                if (opt.ToString() == "allowXss")
+                    opts["allowXss"] = true;
+            }
+            if (m_UrlModule != null)
+                return m_UrlModule.RequestURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID, opts).ToString();
+            return UUID.Zero.ToString();
+        }
+        public LSL_String osRequestSecureURL(LSL_List options)
+        {
+            CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL");
+            Hashtable opts = new Hashtable();
+            for (int i = 0 ; i < options.Length ; i++)
+            {
+                object opt = options.Data[i];
+                if (opt.ToString() == "allowXss")
+                    opts["allowXss"] = true;
+            }
+            if (m_UrlModule != null)
+                return m_UrlModule.RequestSecureURL(m_ScriptEngine.ScriptModule, m_host, m_item.ItemID, opts).ToString();
+            return UUID.Zero.ToString();
+        }
+        public void osCollisionSound(string impact_sound, double impact_volume)
+        {
+            if(impact_sound == "")
+            {
+                m_host.CollisionSoundVolume = (float)impact_volume;
+                m_host.CollisionSound = m_host.invalidCollisionSoundUUID;
+                if(impact_volume == 0.0)
+                    m_host.CollisionSoundType = -1; // disable all sounds
+                else if(impact_volume == 1.0f)
+                    m_host.CollisionSoundType = 0; // full return to default sounds
+                else
+                    m_host.CollisionSoundType = 2; // default sounds with volume
+                m_host.aggregateScriptEvents();
+                return;
+            }
+            // TODO: Parameter check logic required.
+            UUID soundId = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, impact_sound, AssetType.Sound);
+            if(soundId != UUID.Zero)
+            {
+                m_host.CollisionSound = soundId;
+                m_host.CollisionSoundVolume = (float)impact_volume;
+                m_host.CollisionSoundType = 1;
+            }
+            else
+                 m_host.CollisionSoundType = -1;
+            m_host.aggregateScriptEvents();
+        }
+        // still not very usefull, detector is lost on rez, restarts, etc
+        public void osVolumeDetect(int detect)
+        {
+            CheckThreatLevel();
+            if (m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted || m_host.ParentGroup.IsAttachment)
+                return;
+            m_host.ScriptSetVolumeDetect(detect != 0);
+        }
+        /// <summary>
+        /// Get inertial data
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+        /// <returns>
+        /// a LSL list with contents:
+        ///     LSL_Float mass,  the total mass of a linkset
+        ///     LSL_Vector CenterOfMass, center mass relative to root prim
+        ///     LSL_Vector Inertia, elements of diagonal of inertia Ixx,Iyy,Izz divided by total mass
+        ///     LSL_Vector aux, elements of upper triagle of inertia Ixy (= Iyx), Ixz (= Izx), Iyz(= Izy) divided by total mass
+        /// </returns>
+        public LSL_List osGetInertiaData()
+        {
+            LSL_List result = new LSL_List();
+            float TotalMass;
+            Vector3 CenterOfMass;
+            Vector3 Inertia;
+            Vector4 aux;
+            SceneObjectGroup sog = m_host.ParentGroup;
+            if(sog== null || sog.IsDeleted)
+                return result;
+            sog.GetInertiaData(out TotalMass, out CenterOfMass, out Inertia, out aux );
+            if(TotalMass > 0)
+            {
+                float t = 1.0f/TotalMass;
+                Inertia.X *= t;
+                Inertia.Y *= t;
+                Inertia.Z *= t;
+                aux.X *= t;
+                aux.Y *= t;
+                aux.Z *= t;
+            }
+            result.Add(new LSL_Float(TotalMass));
+            result.Add(new LSL_Vector(CenterOfMass.X, CenterOfMass.Y, CenterOfMass.Z));
+            result.Add(new LSL_Vector(Inertia.X, Inertia.Y, Inertia.Z));
+            result.Add(new LSL_Vector(aux.X, aux.Y, aux.Z));
+            return result;
+        }
+        /// <summary>
+        /// set inertial data
+        /// replaces the automatic calculation of mass, center of mass and inertia
+        ///
+        /// </summary>
+        /// <param name="Mass">total mass of linkset</param>
+        /// <param name="centerOfMass">location of center of mass relative to root prim in local coords</param>
+        /// <param name="principalInertiaScaled">moment of inertia relative to principal axis and center of mass,Ixx, Iyy, Izz divided by mass</param>
+        /// <param name="lslrot">rotation of the inertia, relative to local axis</param>
+        /// <remarks>
+        /// the inertia argument is is inertia divided by mass, so corresponds only to the geometric distribution of mass and both can be changed independently.
+        /// </remarks>
+        public void osSetInertia(LSL_Float mass, LSL_Vector centerOfMass, LSL_Vector principalInertiaScaled,  LSL_Rotation lslrot)
+        {
+            SceneObjectGroup sog = m_host.ParentGroup;
+            if(sog== null || sog.IsDeleted)
+                return;
+            if(mass < 0 || principalInertiaScaled.x < 0 || principalInertiaScaled.y < 0 || principalInertiaScaled.z < 0)
+                return;
+            // need more checks
+            Vector3 CenterOfMass = new Vector3((float)centerOfMass.x,(float)centerOfMass.y,(float)centerOfMass.z);
+            Vector3 Inertia;
+            float m = (float)mass;
+            Inertia.X = m * (float)principalInertiaScaled.x;
+            Inertia.Y = m * (float)principalInertiaScaled.y;
+            Inertia.Z = m * (float)principalInertiaScaled.z;
+            Vector4 rot = new Vector4((float)lslrot.x, (float)lslrot.y, (float)lslrot.y, (float)lslrot.s);
+            rot.Normalize();
+            sog.SetInertiaData(m, CenterOfMass, Inertia, rot );
+        }
+        /// <summary>
+        /// set inertial data as a sphere
+        /// replaces the automatic calculation of mass, center of mass and inertia
+        ///
+        /// </summary>
+        /// <param name="Mass">total mass of linkset</param>
+        /// <param name="boxsize">size of the Box</param>
+        /// <param name="centerOfMass">location of center of mass relative to root prim in local coords</param>
+        /// <param name="lslrot">rotation of the box, and so inertia, relative to local axis</param>
+        /// <remarks>
+        /// </remarks>
+        public void osSetInertiaAsBox(LSL_Float mass, LSL_Vector boxSize, LSL_Vector centerOfMass, LSL_Rotation lslrot)
+        {
+            SceneObjectGroup sog = m_host.ParentGroup;
+            if(sog== null || sog.IsDeleted)
+                return;
+            if(mass < 0)
+                return;
+            // need more checks
+            Vector3 CenterOfMass = new Vector3((float)centerOfMass.x,(float)centerOfMass.y,(float)centerOfMass.z);
+            Vector3 Inertia;
+            float lx = (float)boxSize.x;
+            float ly = (float)boxSize.y;
+            float lz = (float)boxSize.z;
+            float m = (float)mass;
+            float t = m / 12.0f;
+            Inertia.X = t * (ly*ly + lz*lz);
+            Inertia.Y = t * (lx*lx + lz*lz);
+            Inertia.Z = t * (lx*lx + ly*ly);
+            Vector4 rot = new Vector4((float)lslrot.x, (float)lslrot.y, (float)lslrot.z, (float)lslrot.s);
+            rot.Normalize();
+            sog.SetInertiaData(m, CenterOfMass, Inertia, rot );
+        }
+        /// <summary>
+        /// set inertial data as a sphere
+        /// replaces the automatic calculation of mass, center of mass and inertia
+        ///
+        /// </summary>
+        /// <param name="Mass">total mass of linkset</param>
+        /// <param name="radius">radius of the sphere</param>
+        /// <param name="centerOfMass">location of center of mass relative to root prim in local coords</param>
+        /// <remarks>
+        /// </remarks>
+        public void osSetInertiaAsSphere(LSL_Float mass,  LSL_Float radius, LSL_Vector centerOfMass)
+        {
+            SceneObjectGroup sog = m_host.ParentGroup;
+            if(sog== null || sog.IsDeleted)
+                return;
+            if(mass < 0)
+                return;
+            // need more checks
+            Vector3 CenterOfMass = new Vector3((float)centerOfMass.x,(float)centerOfMass.y,(float)centerOfMass.z);
+            Vector3 Inertia;
+            float r = (float)radius;
+            float m = (float)mass;
+            float t = 0.4f * m * r * r;
+            Inertia.X = t;
+            Inertia.Y = t;
+            Inertia.Z = t;
+            sog.SetInertiaData(m, CenterOfMass, Inertia, new Vector4(0f, 0f, 0f,1.0f));
+        }
+        /// <summary>
+        /// set inertial data as a cylinder
+        /// replaces the automatic calculation of mass, center of mass and inertia
+        ///
+        /// </summary>
+        /// <param name="Mass">total mass of linkset</param>
+        /// <param name="radius">radius of the cylinder</param>
+        /// <param name="lenght">lenght of the cylinder</param>
+        /// <param name="centerOfMass">location of center of mass relative to root prim in local coords</param>
+        /// <param name="lslrot">rotation of the cylinder, and so inertia, relative to local axis</param>
+        /// <remarks>
+        /// cylinder axis aligned with Z axis. For other orientations provide the rotation.
+        /// </remarks>
+        public void osSetInertiaAsCylinder(LSL_Float mass,  LSL_Float radius, LSL_Float lenght, LSL_Vector centerOfMass, LSL_Rotation lslrot)
+        {
+            SceneObjectGroup sog = m_host.ParentGroup;
+            if(sog== null || sog.IsDeleted)
+                return;
+            if(mass < 0)
+                return;
+            // need more checks
+            Vector3 CenterOfMass = new Vector3((float)centerOfMass.x,(float)centerOfMass.y,(float)centerOfMass.z);
+            Vector3 Inertia;
+            float m = (float)mass;
+            float r = (float)radius;
+            r *= r;
+            Inertia.Z = 0.5f * m * r;
+            float t = (float)lenght;
+            t *= t;
+            t += 3.0f * r;
+            t *= 8.333333e-2f * m;
+            Inertia.X = t;
+            Inertia.Y = t;
+            Vector4 rot = new Vector4((float)lslrot.x, (float)lslrot.y, (float)lslrot.z, (float)lslrot.s);
+            rot.Normalize();
+            sog.SetInertiaData(m, CenterOfMass, Inertia, rot);
+        }
+        /// <summary>
+        /// removes inertial data manual override
+        /// default automatic calculation is used again
+        ///
+        /// </summary>
+        public void osClearInertia()
+        {
+            SceneObjectGroup sog = m_host.ParentGroup;
+            if(sog== null || sog.IsDeleted)
+                return;
+            sog.SetInertiaData(-1, Vector3.Zero, Vector3.Zero, Vector4.Zero );
+        }
+        private bool checkAllowObjectTPbyLandOwner(Vector3 pos)
+        {
+            ILandObject land = World.LandChannel.GetLandObject(pos);
+            if(land == null)
+                return true;
+            LandData landdata = land.LandData;
+            if(landdata == null)
+                return true;
+            UUID hostOwner = m_host.OwnerID;
+            if(landdata.OwnerID == hostOwner)
+                return true;
+            EstateSettings es = World.RegionInfo.EstateSettings;
+            if(es != null && es.IsEstateManagerOrOwner(hostOwner))
+                return true;
+            if(!landdata.IsGroupOwned)
+                return false;
+            UUID landGroup = landdata.GroupID;
+            if(landGroup == UUID.Zero)
+                return false;
+            if(landGroup == m_host.GroupID)
+                return true;
+            return false;
+        }
+       /// <summary>
+        /// teleports a object (full linkset)
+        /// </summary>
+        /// <param name="objectUUID">the id of the linkset to teleport</param>
+        /// <param name="targetPos">target position</param>
+        /// <param name="rotation"> a rotation to apply</param>
+        /// <param name="flags">several flags/param>
+        /// <remarks>
+        /// only does teleport local to region
+        /// if object has scripts, owner must have rights to run scripts on target location
+        /// object owner must have rights to enter ojects on target location
+        /// target location parcel must have enought free prims capacity for the linkset prims
+        /// all avatars siting on the object must have access to target location
+        /// has a cool down time. retries before expire reset it
+        /// fail conditions are silent ignored
+        /// </remarks>
+        public LSL_Integer osTeleportObject(LSL_Key objectUUID, LSL_Vector targetPos, LSL_Rotation rotation, LSL_Integer flags)
+        {
+            CheckThreatLevel(ThreatLevel.Severe, "osTeleportObject");
+            UUID objUUID;
+            if (!UUID.TryParse(objectUUID, out objUUID))
+            {
+                OSSLShoutError("osTeleportObject() invalid object Key");
+                return -1;
+            }
+            SceneObjectGroup sog = World.GetSceneObjectGroup(objUUID);
+            if(sog== null || sog.IsDeleted || sog.inTransit)
+                return -1;
+            if(sog.OwnerID != m_host.OwnerID)
+            {
+                Vector3 pos = sog.AbsolutePosition;
+                if(!checkAllowObjectTPbyLandOwner(pos))
+                    return -1;
+            }
+            UUID myid = m_host.ParentGroup.UUID;
+            return sog.TeleportObject(myid, targetPos, rotation, flags);
+            // a delay here may break vehicles
+        }
+        public LSL_Integer osGetLinkNumber(LSL_String name)
+        {
+            SceneObjectGroup sog = m_host.ParentGroup;
+            if(sog== null || sog.IsDeleted)
+                return -1;
+            return sog.GetLinkNumber(name);
+        }
    }
 }