aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-04-17 01:25:41 +0100
committerJustin Clark-Casey (justincc)2012-04-17 01:25:41 +0100
commit24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68 (patch)
tree3f5c985d49dac06300eb4fcfa0637e07f56fc45e /OpenSim/Region/CoreModules
parentNull reference in llGetObjectMass on a seated avatar. (diff)
downloadopensim-SC_OLD-24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68.zip
opensim-SC_OLD-24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68.tar.gz
opensim-SC_OLD-24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68.tar.bz2
opensim-SC_OLD-24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68.tar.xz
refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does.
This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities. As per opensim-dev mailing list.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs2
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 124f01c..58bbd24 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -967,7 +967,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
967 { 967 {
968 RegionHandshakeArgs args = new RegionHandshakeArgs(); 968 RegionHandshakeArgs args = new RegionHandshakeArgs();
969 969
970 args.isEstateManager = Scene.RegionInfo.EstateSettings.IsEstateManager(remoteClient.AgentId); 970 args.isEstateManager = Scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(remoteClient.AgentId);
971 if (Scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero && Scene.RegionInfo.EstateSettings.EstateOwner == remoteClient.AgentId) 971 if (Scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero && Scene.RegionInfo.EstateSettings.EstateOwner == remoteClient.AgentId)
972 args.isEstateManager = true; 972 args.isEstateManager = true;
973 973
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 7f44613..0536f6e 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -469,7 +469,7 @@ namespace OpenSim.Region.CoreModules.World.Land
469 if (m_scene.Permissions.IsAdministrator(avatar)) 469 if (m_scene.Permissions.IsAdministrator(avatar))
470 return false; 470 return false;
471 471
472 if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) 472 if (m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(avatar))
473 return false; 473 return false;
474 474
475 if (avatar == LandData.OwnerID) 475 if (avatar == LandData.OwnerID)
@@ -499,7 +499,7 @@ namespace OpenSim.Region.CoreModules.World.Land
499 if (m_scene.Permissions.IsAdministrator(avatar)) 499 if (m_scene.Permissions.IsAdministrator(avatar))
500 return false; 500 return false;
501 501
502 if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar)) 502 if (m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(avatar))
503 return false; 503 return false;
504 504
505 if (avatar == LandData.OwnerID) 505 if (avatar == LandData.OwnerID)
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 64759a7..2032905 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -503,7 +503,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
503 { 503 {
504 if (user == UUID.Zero) return false; 504 if (user == UUID.Zero) return false;
505 505
506 return m_scene.RegionInfo.EstateSettings.IsEstateManager(user); 506 return m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(user);
507 } 507 }
508 508
509#endregion 509#endregion