aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
diff options
context:
space:
mode:
authorAdam Frisby2008-05-06 04:56:48 +0000
committerAdam Frisby2008-05-06 04:56:48 +0000
commit31cd162d34ab03284186484924e434a1187942cf (patch)
tree0edad805100caebd12d3bb103bef42503b92de57 /OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
parent* Committing a bunch of work for control snatching. Not done yet. No visib... (diff)
downloadopensim-SC_OLD-31cd162d34ab03284186484924e434a1187942cf.zip
opensim-SC_OLD-31cd162d34ab03284186484924e434a1187942cf.tar.gz
opensim-SC_OLD-31cd162d34ab03284186484924e434a1187942cf.tar.bz2
opensim-SC_OLD-31cd162d34ab03284186484924e434a1187942cf.tar.xz
* Cleaning up code, making it conform to OpenSim standards.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index de02702..b613bd0 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
146 146
147 string reason = "Insufficient permission"; 147 string reason = "Insufficient permission";
148 148
149 ILandObject land = m_scene.LandChannel.getLandObject(position.X, position.Y); 149 ILandObject land = m_scene.LandChannel.GetLandObject(position.X, position.Y);
150 if (land == null) return false; 150 if (land == null) return false;
151 151
152 if ((land.landData.landFlags & ((int)Parcel.ParcelFlags.CreateObjects)) == 152 if ((land.landData.landFlags & ((int)Parcel.ParcelFlags.CreateObjects)) ==
@@ -187,8 +187,8 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
187 return true; 187 return true;
188 } 188 }
189 189
190 ILandObject land1 = m_scene.LandChannel.getLandObject(oldPos.X, oldPos.Y); 190 ILandObject land1 = m_scene.LandChannel.GetLandObject(oldPos.X, oldPos.Y);
191 ILandObject land2 = m_scene.LandChannel.getLandObject(newPos.X, newPos.Y); 191 ILandObject land2 = m_scene.LandChannel.GetLandObject(newPos.X, newPos.Y);
192 192
193 if (land1 == null || land2 == null) 193 if (land1 == null || land2 == null)
194 { 194 {
@@ -285,7 +285,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
285 } 285 }
286 286
287 // Users should be able to edit what is over their land. 287 // Users should be able to edit what is over their land.
288 ILandObject parcel = m_scene.LandChannel.getLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y); 288 ILandObject parcel = m_scene.LandChannel.GetLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y);
289 if (parcel != null && parcel.landData.ownerID == user) 289 if (parcel != null && parcel.landData.ownerID == user)
290 return objectOwnerMask; 290 return objectOwnerMask;
291 291
@@ -377,7 +377,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
377 } 377 }
378 378
379 // Users should be able to edit what is over their land. 379 // Users should be able to edit what is over their land.
380 ILandObject parcel = m_scene.LandChannel.getLandObject(group.AbsolutePosition.X, group.AbsolutePosition.Y); 380 ILandObject parcel = m_scene.LandChannel.GetLandObject(group.AbsolutePosition.X, group.AbsolutePosition.Y);
381 if ((parcel != null) && (parcel.landData.ownerID == currentUser)) 381 if ((parcel != null) && (parcel.landData.ownerID == currentUser))
382 { 382 {
383 permission = true; 383 permission = true;
@@ -599,7 +599,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
599 Y = 0; 599 Y = 0;
600 600
601 // Land owner can terraform too 601 // Land owner can terraform too
602 ILandObject parcel = m_scene.LandChannel.getLandObject(X, Y); 602 ILandObject parcel = m_scene.LandChannel.GetLandObject(X, Y);
603 if (parcel != null && GenericParcelPermission(user, parcel)) 603 if (parcel != null && GenericParcelPermission(user, parcel))
604 permission = true; 604 permission = true;
605 605
@@ -673,7 +673,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
673 673
674 protected virtual bool GenericParcelPermission(LLUUID user, LLVector3 pos) 674 protected virtual bool GenericParcelPermission(LLUUID user, LLVector3 pos)
675 { 675 {
676 ILandObject parcel = m_scene.LandChannel.getLandObject(pos.X, pos.Y); 676 ILandObject parcel = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
677 if (parcel == null) return false; 677 if (parcel == null) return false;
678 return GenericParcelPermission(user, parcel); 678 return GenericParcelPermission(user, parcel);
679 } 679 }