aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-09 12:06:53 -0800
committerJohn Hurliman2010-03-09 12:06:53 -0800
commit01218093a6ac1e7e4be0147d58b1b571f965e1c4 (patch)
treea3a06136c98a8675e332cd98333212ba7097cb36 /OpenSim/Region/CoreModules/World
parent* Added code to support either CSJ2K or OpenJPEG texture decoding. Currently ... (diff)
downloadopensim-SC_OLD-01218093a6ac1e7e4be0147d58b1b571f965e1c4.zip
opensim-SC_OLD-01218093a6ac1e7e4be0147d58b1b571f965e1c4.tar.gz
opensim-SC_OLD-01218093a6ac1e7e4be0147d58b1b571f965e1c4.tar.bz2
opensim-SC_OLD-01218093a6ac1e7e4be0147d58b1b571f965e1c4.tar.xz
* Typo fixes
* Performance improvement in the expensive GenerateClientFlags()
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 4652d70..2211f3e 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -609,16 +609,17 @@ namespace OpenSim.Region.CoreModules.World.Permissions
609 if (IsFriendWithPerms(user, objectOwner)) 609 if (IsFriendWithPerms(user, objectOwner))
610 return objectOwnerMask; 610 return objectOwnerMask;
611 611
612 // Estate users should be able to edit anything in the sim 612 // Estate users should be able to edit anything in the sim if RegionOwnerIsGod is set
613 if (IsEstateManager(user) && m_RegionOwnerIsGod && (!IsAdministrator(objectOwner)) || objectOwner == user) 613 if (IsEstateManager(user) && m_RegionOwnerIsGod)
614 return objectOwnerMask; 614 return objectOwnerMask;
615 615
616 // Admin should be able to edit anything in the sim (including admin objects) 616 // Admin should be able to edit anything in the sim (including admin objects)
617 if (IsAdministrator(user)) 617 if (IsAdministrator(user))
618 return objectOwnerMask; 618 return objectOwnerMask;
619 619
620 // Users should be able to edit what is over their land. 620 // Users should be able to edit what is over their land.
621 ILandObject parcel = m_scene.LandChannel.GetLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y); 621 Vector3 taskPos = task.AbsolutePosition;
622 ILandObject parcel = m_scene.LandChannel.GetLandObject(taskPos.X, taskPos.Y);
622 if (parcel != null && parcel.LandData.OwnerID == user && m_ParcelOwnerIsGod) 623 if (parcel != null && parcel.LandData.OwnerID == user && m_ParcelOwnerIsGod)
623 { 624 {
624 // Admin objects should not be editable by the above 625 // Admin objects should not be editable by the above