diff options
author | Oren Hurvitz | 2014-04-16 11:43:30 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-20 06:23:35 +0100 |
commit | a780e01a544e13cc0326ad92ca7927b2443e5ce4 (patch) | |
tree | 55e84ea91ed7182876df10e3bfb445e3e8e59a5d /OpenSim/Region/Framework/Scenes | |
parent | Catch empty url error (diff) | |
download | opensim-SC_OLD-a780e01a544e13cc0326ad92ca7927b2443e5ce4.zip opensim-SC_OLD-a780e01a544e13cc0326ad92ca7927b2443e5ce4.tar.gz opensim-SC_OLD-a780e01a544e13cc0326ad92ca7927b2443e5ce4.tar.bz2 opensim-SC_OLD-a780e01a544e13cc0326ad92ca7927b2443e5ce4.tar.xz |
Fixed: the parcel flag "Allow Scripts from Group" should only check if the parcel has a Group set; it doesn't have to be *deeded* to the group
Also some cleanup of the use of Group ID's (with no change to functionality).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2ccb28d..e6887b4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4516,29 +4516,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
4516 | { | 4516 | { |
4517 | return true; | 4517 | return true; |
4518 | } | 4518 | } |
4519 | else if ((parcel.LandData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0) | 4519 | else if ((part.OwnerID == parcel.LandData.OwnerID) || Permissions.IsGod(part.OwnerID)) |
4520 | { | 4520 | { |
4521 | if (part.OwnerID == parcel.LandData.OwnerID | 4521 | return true; |
4522 | || (parcel.LandData.IsGroupOwned && part.GroupID == parcel.LandData.GroupID) | 4522 | } |
4523 | || Permissions.IsGod(part.OwnerID)) | 4523 | else if (((parcel.LandData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0) |
4524 | { | 4524 | && (parcel.LandData.GroupID != UUID.Zero) && (parcel.LandData.GroupID == part.GroupID)) |
4525 | return true; | 4525 | { |
4526 | } | 4526 | return true; |
4527 | else | ||
4528 | { | ||
4529 | return false; | ||
4530 | } | ||
4531 | } | 4527 | } |
4532 | else | 4528 | else |
4533 | { | 4529 | { |
4534 | if (part.OwnerID == parcel.LandData.OwnerID) | 4530 | return false; |
4535 | { | ||
4536 | return true; | ||
4537 | } | ||
4538 | else | ||
4539 | { | ||
4540 | return false; | ||
4541 | } | ||
4542 | } | 4531 | } |
4543 | } | 4532 | } |
4544 | else | 4533 | else |