From e5c367442132d7edc846b28f36ddac9e82b66cda Mon Sep 17 00:00:00 2001 From: onefang Date: Wed, 9 Sep 2020 06:15:12 +1000 Subject: 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. --- .../Avatar/Attachments/AttachmentsModule.cs | 18 ++++++++-------- .../InventoryAccess/InventoryAccessModule.cs | 25 ++-------------------- 2 files changed, 11 insertions(+), 32 deletions(-) (limited to 'OpenSim/Region/CoreModules') 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) -- cgit v1.1