Remove various limits.

Silly 4096 sim TP check for a client bug that was fixed long ago, seems
they removed it themselves.

Upgrade sim height.
Allow menu items longer than 24 characters once more.
Allow sitting on attachments, and attaching things with people sitting
on them.
Revert don't wear vegetables.
Remove some script distance limits.
Gods can do anything they want, including bypassing OhSilly threat
levels.

Low Y regions are no longer reserved for HG links.
Varregions don't have to be square.
    Both now report a warning, but continue anyway.
    Cool VL Viewer handles non square regions, Singularity crashes.  Not
    tested on others.

10 files changed, 50 insertions, 120 deletions

diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs
index 64912b4..ea89db3 100644
--- a/OpenSim/Framework/Constants.cs
+++ b/OpenSim/Framework/Constants.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
         // DO NOT USE THIS FOR ANY NEW CODE. Use Scene.RegionInfo.RegionSize[XYZ] as a region might not
         //      be the legacy region size.
         public const uint RegionSize = 256;
-        public const uint RegionHeight = 4096;
+        public const uint RegionHeight = 16384;
 
         public const uint MaximumRegionSize = 4096;
 
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index b88d31f..df0b8da 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -846,10 +846,10 @@ namespace OpenSim.Framework
                 if (RegionSizeX != RegionSizeY)
                 {
                     uint minSize = Math.Min(RegionSizeX, RegionSizeY);
-                    RegionSizeX = minSize;
-                    RegionSizeY = minSize;
-                    m_log.ErrorFormat("{0} Regions must be square until viewers are updated. Forcing region {1} size to <{2},{3}>",
-                                        LogHeader, m_regionName, RegionSizeX, RegionSizeY);
+////                    RegionSizeX = minSize;
+////                    RegionSizeY = minSize;
+                    m_log.WarnFormat("{0} Regions must be square until viewers are updated. NOT Forcing region {1} size to <{2},{3}>",
+                                        LogHeader, m_regionName, minSize, minSize);
                 }
 
                 // There is a practical limit to region size.
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index d0902ff..51eeff7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3112,7 +3112,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             for (int i = 0; i < buttonlabels.Length; i++)
             {
                 buttons[i] = new ScriptDialogPacket.ButtonsBlock();
-                buttons[i].ButtonLabel = Util.StringToBytes(buttonlabels[i],24);
+                buttons[i].ButtonLabel = Util.StringToBytes256(buttonlabels[i]);
             }
             dialog.Buttons = buttons;
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index e82dc7f..64bfb4f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -550,15 +550,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 //                    group.Name, group.LocalId, sp.Name, attachmentPt, silent);
 
 
-            if (group.GetSittingAvatarsCount() != 0)
-            {
-                if (DebugLevel > 0)
-                    m_log.WarnFormat(
-                        "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it",
-                        group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount());
-
-                return false;
-            }
+////            if (group.GetSittingAvatarsCount() != 0)
+////            {
+////                if (DebugLevel > 0)
+////                    m_log.WarnFormat(
+////                        "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it",
+////                        group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount());
+////
+////                return false;
+////            }
 
             Vector3 attachPos = group.AbsolutePosition;
 
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index facb7a0..0d6fa17 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -919,29 +919,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             }
 
             int primcount = 0;
-            if(attachment)
-            {
-                foreach (SceneObjectGroup g in objlist)
-                {
-                    if(g.RootPart.Shape != null)
-                    {
-                        PCode code = (PCode)g.RootPart.Shape.PCode;
-                        if(code == PCode.Grass || code == PCode.NewTree || code == PCode.Tree)
-                        {
-                            // dont wear vegetables
-                            remoteClient.SendAgentAlertMessage("You cannot wear system plants. They could grow roots inside your avatar", false);
-                            return null;
-                        }
-                    }
-                    primcount += g.PrimCount;
-                }
-            }
-            else
-            {
-                foreach (SceneObjectGroup g in objlist)
-                    primcount += g.PrimCount;
-            }
-
+            foreach (SceneObjectGroup g in objlist)
+                primcount += g.PrimCount;
 
             if (!m_Scene.Permissions.CanRezObject(
                 primcount, remoteClient.AgentId, pos)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c80fba2..0d8f286 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3595,14 +3595,14 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (part != null)
             {
-                if (part.ParentGroup.IsAttachment)
-                {
-                    m_log.WarnFormat(
-                        "[SCENE PRESENCE]: Avatar {0} tried to sit on part {1} from object {2} in {3} but this is an attachment for avatar id {4}",
-                        Name, part.Name, part.ParentGroup.Name, Scene.Name, part.ParentGroup.AttachedAvatar);
-
-                    return;
-                }
+////                if (part.ParentGroup.IsAttachment)
+////                {
+////                    m_log.WarnFormat(
+////                        "[SCENE PRESENCE]: Avatar {0} tried to sit on part {1} from object {2} in {3} but this is an attachment for avatar id {4}",
+////                        Name, part.Name, part.ParentGroup.Name, Scene.Name, part.ParentGroup.AttachedAvatar);
+////
+////                    return;
+////                }
 
                 if (part.SitTargetAvatar == UUID)
                 {
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
+}
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index b42cfb1..18fcd9b 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -198,7 +198,8 @@ namespace OpenSim.Services.GridService
                 return "Invalid RegionID - cannot be zero UUID";
 
             if (regionInfos.RegionLocY <= Constants.MaximumRegionSize)
-                return "Region location reserved for HG links coord Y must be higher than " + (Constants.MaximumRegionSize/256).ToString();
+                m_log.WarnFormat("{0} Region location reserved for HG links coord Y should be higher than {1}.", LogHeader, (Constants.MaximumRegionSize/256).ToString());
+////                return "Region location reserved for HG links coord Y must be higher than " + (Constants.MaximumRegionSize/256).ToString();
 
             String reason = "Region overlaps another region";
 
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 4f5fe59..3c7295a 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -63,7 +63,6 @@ namespace OpenSim.Services.GridService
         protected GatekeeperServiceConnector m_GatekeeperConnector;
 
         protected UUID m_ScopeID = UUID.Zero;
-//        protected bool m_Check4096 = true;
         protected string m_MapTileDirectory = string.Empty;
         protected string m_ThisGatekeeperURI = string.Empty;
         protected string m_ThisGatekeeperHost = string.Empty;
@@ -93,8 +92,6 @@ namespace OpenSim.Services.GridService
             if (scope != string.Empty)
                 UUID.TryParse(scope, out m_ScopeID);
 
-//                m_Check4096 = gridConfig.GetBoolean("Check4096", true);
-
 //// TODO OpenSim is crazy, this is called from Robust and OpenSim, Robust needs the ../caches bit, OpenSim somehow adds a path already.  I can't tell why.  So strip the path.
             m_MapTileDirectory = Path.Combine(Util.cacheDir(), Path.GetFileName(gridConfig.GetString("MapTileDirectory", "maptiles")));
 
@@ -305,19 +302,6 @@ namespace OpenSim.Services.GridService
                 return true;
             }
 
-            // We are now performing this check for each individual teleport in the EntityTransferModule instead.  This
-            // allows us to give better feedback when teleports fail because of the distance reason (which can't be
-            // done here) and it also hypergrid teleports that are within range (possibly because the source grid
-            // itself has regions that are very far apart).
-//            uint x, y;
-//            if (m_Check4096 && !Check4096(handle, out x, out y))
-//            {
-//                //RemoveHyperlinkRegion(regInfo.RegionID);
-//                reason = "Region is too far (" + x + ", " + y + ")";
-//                m_log.Info("[HYPERGRID LINKER]: Unable to link, region is too far (" + x + ", " + y + ")");
-//                //return false;
-//            }
-
             regInfo.RegionID = regionID;
             regInfo.RegionSizeX = sizeX;
             regInfo.RegionSizeY = sizeY;
@@ -370,52 +354,6 @@ namespace OpenSim.Services.GridService
             }
         }
 
-// Not currently used
-//        /// <summary>
-//        /// Cope with this viewer limitation.
-//        /// </summary>
-//        /// <param name="regInfo"></param>
-//        /// <returns></returns>
-//        public bool Check4096(ulong realHandle, out uint x, out uint y)
-//        {
-//            uint ux = 0, uy = 0;
-//            Utils.LongToUInts(realHandle, out ux, out uy);
-//            x = Util.WorldToRegionLoc(ux);
-//            y = Util.WorldToRegionLoc(uy);
-//
-//            const uint limit = Util.RegionToWorldLoc(4096 - 1);
-//            uint xmin = ux - limit;
-//            uint xmax = ux + limit;
-//            uint ymin = uy - limit;
-//            uint ymax = uy + limit;
-//            // World map boundary checks
-//            if (xmin < 0 || xmin > ux)
-//                xmin = 0;
-//            if (xmax > int.MaxValue || xmax < ux)
-//                xmax = int.MaxValue;
-//            if (ymin < 0 || ymin > uy)
-//                ymin = 0;
-//            if (ymax > int.MaxValue || ymax < uy)
-//                ymax = int.MaxValue;
-//
-//            // Check for any regions that are within the possible teleport range to the linked region
-//            List<GridRegion> regions = m_GridService.GetRegionRange(m_ScopeID, (int)xmin, (int)xmax, (int)ymin, (int)ymax);
-//            if (regions.Count == 0)
-//            {
-//                return false;
-//            }
-//            else
-//            {
-//                // Check for regions which are not linked regions
-//                List<GridRegion> hyperlinks = m_GridService.GetHyperlinks(m_ScopeID);
-//                IEnumerable<GridRegion> availableRegions = regions.Except(hyperlinks);
-//                if (availableRegions.Count() == 0)
-//                    return false;
-//            }
-//
-//            return true;
-//        }
-
         private void AddHyperlinkRegion(GridRegion regionInfo, ulong regionHandle)
         {
             RegionData rdata = m_GridService.RegionInfo2RegionData(regionInfo);