2 files changed, 23 insertions, 11 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8815a28..41d1342 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2709,8 +2709,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     pos.x < -10.0 || // return FALSE if more than 10 meters into a west-adjacent region.
                     pos.x > (World.RegionInfo.RegionSizeX + 10) || // return FALSE if more than 10 meters into a east-adjacent region.
                     pos.y < -10.0 || // return FALSE if more than 10 meters into a south-adjacent region.
-                    pos.y > (World.RegionInfo.RegionSizeY + 10) || // return FALSE if more than 10 meters into a north-adjacent region.
-                    pos.z > Constants.RegionHeight // return FALSE if altitude than 4096m
+                    pos.y > (World.RegionInfo.RegionSizeY + 10) // return FALSE if more than 10 meters into a north-adjacent region.
                 )
             )
             {
@@ -3609,9 +3608,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             float dist = (float)llVecDist(llGetPos(), pos);
 
-            if (dist > m_ScriptDistanceFactor * 10.0f)
-                return;
-
             TaskInventoryItem item = m_host.Inventory.GetInventoryItem(inventory);
 
             if (item == null)
@@ -8182,16 +8178,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 if (buttons.Data[i].ToString() == String.Empty)
                 {
-                    Error("llDialog", "Button label cannot be blank");
+                    Error("llDialog", "Button label cannot be blank.");
                     return;
                 }
-/*
                 if (buttons.Data[i].ToString().Length > 24)
                 {
-                    Error("llDialog", "Button label cannot be longer than 24 characters");
-                    return;
+                    Error("llDialog", "Button label should not be longer than 24 characters.");
                 }
-*/
                 buts[i] = buttons.Data[i].ToString();
             }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index eb7049e..53bfa66 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -336,6 +336,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         private string CheckThreatLevelTest(ThreatLevel level, string function)
         {
             FunctionPerms perms;
+
+            // This test is coz the test system manages to call scripts without having them in items.
+            //// TODO - fix up the test system.
+            if ((null != m_item) && (null != m_item.OwnerID))
+            {
+                // 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.TryGetValue(function, out perms))
             {
                 perms = new FunctionPerms();
@@ -5675,4 +5694,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return 0;
         }
     }
-}
\ No newline at end of file
+}