diff options
author | onefang | 2020-09-09 06:15:12 +1000 |
---|---|---|
committer | onefang | 2020-09-09 06:15:12 +1000 |
commit | e5c367442132d7edc846b28f36ddac9e82b66cda (patch) | |
tree | a31fc2f4c558e306822128ad38a99f1529a70af2 /OpenSim/Region/CoreModules | |
parent | OpenSim changed the way FSAssets directory structure works by default, sort t... (diff) | |
download | opensim-SC-e5c367442132d7edc846b28f36ddac9e82b66cda.zip opensim-SC-e5c367442132d7edc846b28f36ddac9e82b66cda.tar.gz opensim-SC-e5c367442132d7edc846b28f36ddac9e82b66cda.tar.bz2 opensim-SC-e5c367442132d7edc846b28f36ddac9e82b66cda.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 25 |
2 files changed, 11 insertions, 32 deletions
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 | |||
550 | // group.Name, group.LocalId, sp.Name, attachmentPt, silent); | 550 | // group.Name, group.LocalId, sp.Name, attachmentPt, silent); |
551 | 551 | ||
552 | 552 | ||
553 | if (group.GetSittingAvatarsCount() != 0) | 553 | //// if (group.GetSittingAvatarsCount() != 0) |
554 | { | 554 | //// { |
555 | if (DebugLevel > 0) | 555 | //// if (DebugLevel > 0) |
556 | m_log.WarnFormat( | 556 | //// m_log.WarnFormat( |
557 | "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it", | 557 | //// "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it", |
558 | group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount()); | 558 | //// group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount()); |
559 | 559 | //// | |
560 | return false; | 560 | //// return false; |
561 | } | 561 | //// } |
562 | 562 | ||
563 | Vector3 attachPos = group.AbsolutePosition; | 563 | Vector3 attachPos = group.AbsolutePosition; |
564 | 564 | ||
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 | |||
919 | } | 919 | } |
920 | 920 | ||
921 | int primcount = 0; | 921 | int primcount = 0; |
922 | if(attachment) | 922 | foreach (SceneObjectGroup g in objlist) |
923 | { | 923 | primcount += g.PrimCount; |
924 | foreach (SceneObjectGroup g in objlist) | ||
925 | { | ||
926 | if(g.RootPart.Shape != null) | ||
927 | { | ||
928 | PCode code = (PCode)g.RootPart.Shape.PCode; | ||
929 | if(code == PCode.Grass || code == PCode.NewTree || code == PCode.Tree) | ||
930 | { | ||
931 | // dont wear vegetables | ||
932 | remoteClient.SendAgentAlertMessage("You cannot wear system plants. They could grow roots inside your avatar", false); | ||
933 | return null; | ||
934 | } | ||
935 | } | ||
936 | primcount += g.PrimCount; | ||
937 | } | ||
938 | } | ||
939 | else | ||
940 | { | ||
941 | foreach (SceneObjectGroup g in objlist) | ||
942 | primcount += g.PrimCount; | ||
943 | } | ||
944 | |||
945 | 924 | ||
946 | if (!m_Scene.Permissions.CanRezObject( | 925 | if (!m_Scene.Permissions.CanRezObject( |
947 | primcount, remoteClient.AgentId, pos) | 926 | primcount, remoteClient.AgentId, pos) |