diff options
author | Sean Dague | 2008-07-23 15:50:32 +0000 |
---|---|---|
committer | Sean Dague | 2008-07-23 15:50:32 +0000 |
commit | 090159defc731fca252b2b3520364712760f0f4e (patch) | |
tree | 78fe9dde5a9902d67aa6d1690cf575d778d154f2 /OpenSim/Region/Environment/Modules/World/Permissions | |
parent | Send Animation data for other avatars to new users joining the region (tested... (diff) | |
download | opensim-SC-090159defc731fca252b2b3520364712760f0f4e.zip opensim-SC-090159defc731fca252b2b3520364712760f0f4e.tar.gz opensim-SC-090159defc731fca252b2b3520364712760f0f4e.tar.bz2 opensim-SC-090159defc731fca252b2b3520364712760f0f4e.tar.xz |
refactored LandData to use properties, and cleaned up the naming on
the properties a bit to be more consistant with other objects (having things
like .Name .Description, etc).
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Permissions')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index b0d9a26..23db484 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -331,7 +331,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
331 | 331 | ||
332 | // Users should be able to edit what is over their land. | 332 | // Users should be able to edit what is over their land. |
333 | ILandObject parcel = m_scene.LandChannel.GetLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y); | 333 | ILandObject parcel = m_scene.LandChannel.GetLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y); |
334 | if (parcel != null && parcel.landData.ownerID == user) | 334 | if (parcel != null && parcel.landData.OwnerID == user) |
335 | return objectOwnerMask; | 335 | return objectOwnerMask; |
336 | 336 | ||
337 | // Admin objects should not be editable by the above | 337 | // Admin objects should not be editable by the above |
@@ -423,7 +423,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
423 | 423 | ||
424 | // Users should be able to edit what is over their land. | 424 | // Users should be able to edit what is over their land. |
425 | ILandObject parcel = m_scene.LandChannel.GetLandObject(group.AbsolutePosition.X, group.AbsolutePosition.Y); | 425 | ILandObject parcel = m_scene.LandChannel.GetLandObject(group.AbsolutePosition.X, group.AbsolutePosition.Y); |
426 | if ((parcel != null) && (parcel.landData.ownerID == currentUser)) | 426 | if ((parcel != null) && (parcel.landData.OwnerID == currentUser)) |
427 | { | 427 | { |
428 | permission = true; | 428 | permission = true; |
429 | } | 429 | } |
@@ -492,12 +492,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
492 | { | 492 | { |
493 | bool permission = false; | 493 | bool permission = false; |
494 | 494 | ||
495 | if (parcel.landData.ownerID == user) | 495 | if (parcel.landData.OwnerID == user) |
496 | { | 496 | { |
497 | permission = true; | 497 | permission = true; |
498 | } | 498 | } |
499 | 499 | ||
500 | if (parcel.landData.isGroupOwned) | 500 | if (parcel.landData.IsGroupOwned) |
501 | { | 501 | { |
502 | // TODO: Need to do some extra checks here. Requires group code. | 502 | // TODO: Need to do some extra checks here. Requires group code. |
503 | } | 503 | } |
@@ -723,7 +723,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
723 | return false; | 723 | return false; |
724 | } | 724 | } |
725 | 725 | ||
726 | if ((land.landData.landFlags & ((int)Parcel.ParcelFlags.AllowAllObjectEntry)) != 0) | 726 | if ((land.landData.Flags & ((int)Parcel.ParcelFlags.AllowAllObjectEntry)) != 0) |
727 | { | 727 | { |
728 | return true; | 728 | return true; |
729 | } | 729 | } |
@@ -770,7 +770,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
770 | ILandObject land = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y); | 770 | ILandObject land = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y); |
771 | if (land == null) return false; | 771 | if (land == null) return false; |
772 | 772 | ||
773 | if ((land.landData.landFlags & ((int)Parcel.ParcelFlags.CreateObjects)) == | 773 | if ((land.landData.Flags & ((int)Parcel.ParcelFlags.CreateObjects)) == |
774 | (int)Parcel.ParcelFlags.CreateObjects) | 774 | (int)Parcel.ParcelFlags.CreateObjects) |
775 | permission = true; | 775 | permission = true; |
776 | 776 | ||