aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
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
parentNull reference in llGetObjectMass on a seated avatar. (diff)
downloadopensim-SC-24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68.zip
opensim-SC-24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68.tar.gz
opensim-SC-24a0cc5261f1fd1a1d8779c8fb5e7d7fba98ed68.tar.bz2
opensim-SC-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 '')
-rw-r--r--OpenSim/Framework/EstateSettings.cs4
-rw-r--r--OpenSim/Framework/Tests/MundaneFrameworkTests.cs4
-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
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
9 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 98604f2..a92abbf 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -322,7 +322,7 @@ namespace OpenSim.Framework
322 l_EstateManagers.Remove(avatarID); 322 l_EstateManagers.Remove(avatarID);
323 } 323 }
324 324
325 public bool IsEstateManager(UUID avatarID) 325 public bool IsEstateManagerOrOwner(UUID avatarID)
326 { 326 {
327 if (IsEstateOwner(avatarID)) 327 if (IsEstateOwner(avatarID))
328 return true; 328 return true;
@@ -368,7 +368,7 @@ namespace OpenSim.Framework
368 368
369 public bool HasAccess(UUID user) 369 public bool HasAccess(UUID user)
370 { 370 {
371 if (IsEstateManager(user)) 371 if (IsEstateManagerOrOwner(user))
372 return true; 372 return true;
373 373
374 return l_EstateAccess.Contains(user); 374 return l_EstateAccess.Contains(user);
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
index 76de6be..672847d 100644
--- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
+++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
@@ -227,10 +227,10 @@ namespace OpenSim.Framework.Tests
227 es.AddEstateManager(UUID.Zero); 227 es.AddEstateManager(UUID.Zero);
228 228
229 es.AddEstateManager(bannedUserId); 229 es.AddEstateManager(bannedUserId);
230 Assert.IsTrue(es.IsEstateManager(bannedUserId), "bannedUserId should be EstateManager but isn't."); 230 Assert.IsTrue(es.IsEstateManagerOrOwner(bannedUserId), "bannedUserId should be EstateManager but isn't.");
231 231
232 es.RemoveEstateManager(bannedUserId); 232 es.RemoveEstateManager(bannedUserId);
233 Assert.IsFalse(es.IsEstateManager(bannedUserId), "bannedUserID is estateManager but shouldn't be"); 233 Assert.IsFalse(es.IsEstateManagerOrOwner(bannedUserId), "bannedUserID is estateManager but shouldn't be");
234 234
235 Assert.IsFalse(es.HasAccess(bannedUserId), "bannedUserID has access but shouldn't"); 235 Assert.IsFalse(es.HasAccess(bannedUserId), "bannedUserID has access but shouldn't");
236 236
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
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 641d742..b5f789b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3832,7 +3832,7 @@ namespace OpenSim.Region.Framework.Scenes
3832 land.LandData.UserLocation != Vector3.Zero && 3832 land.LandData.UserLocation != Vector3.Zero &&
3833 land.LandData.OwnerID != m_uuid && 3833 land.LandData.OwnerID != m_uuid &&
3834 (!m_scene.Permissions.IsGod(m_uuid)) && 3834 (!m_scene.Permissions.IsGod(m_uuid)) &&
3835 (!m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid))) 3835 (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)))
3836 { 3836 {
3837 float curr = Vector3.Distance(AbsolutePosition, pos); 3837 float curr = Vector3.Distance(AbsolutePosition, pos);
3838 if (Vector3.Distance(land.LandData.UserLocation, pos) < curr) 3838 if (Vector3.Distance(land.LandData.UserLocation, pos) < curr)
@@ -3852,7 +3852,7 @@ namespace OpenSim.Region.Framework.Scenes
3852 { 3852 {
3853 if (GodLevel < 200 && 3853 if (GodLevel < 200 &&
3854 ((!m_scene.Permissions.IsGod(m_uuid) && 3854 ((!m_scene.Permissions.IsGod(m_uuid) &&
3855 !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid)) || 3855 !m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) ||
3856 (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || 3856 (m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
3857 (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)) 3857 (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0))
3858 { 3858 {
@@ -3920,7 +3920,7 @@ namespace OpenSim.Region.Framework.Scenes
3920 GodLevel < 200 && 3920 GodLevel < 200 &&
3921 ((land.LandData.OwnerID != m_uuid && 3921 ((land.LandData.OwnerID != m_uuid &&
3922 !m_scene.Permissions.IsGod(m_uuid) && 3922 !m_scene.Permissions.IsGod(m_uuid) &&
3923 !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid)) || 3923 !m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_uuid)) ||
3924 (m_teleportFlags & TeleportFlags.ViaLocation) != 0 || 3924 (m_teleportFlags & TeleportFlags.ViaLocation) != 0 ||
3925 (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0)) 3925 (m_teleportFlags & Constants.TeleportFlags.ViaHGLogin) != 0))
3926 { 3926 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5581727..36c9d5e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -10887,7 +10887,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10887 bool isAccount = false; 10887 bool isAccount = false;
10888 bool isGroup = false; 10888 bool isGroup = false;
10889 10889
10890 if (!estate.IsEstateOwner(m_host.OwnerID) || !estate.IsEstateManager(m_host.OwnerID)) 10890 if (!estate.IsEstateOwner(m_host.OwnerID) || !estate.IsEstateManagerOrOwner(m_host.OwnerID))
10891 return 0; 10891 return 0;
10892 10892
10893 UUID id = new UUID(); 10893 UUID id = new UUID();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 77a784d..df20126 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -449,7 +449,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
449 LSShoutError("LightShare functions are not enabled."); 449 LSShoutError("LightShare functions are not enabled.");
450 return 0; 450 return 0;
451 } 451 }
452 if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) 452 if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
453 { 453 {
454 LSShoutError("lsSetWindlightScene can only be used by estate managers or owners."); 454 LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
455 return 0; 455 return 0;
@@ -477,7 +477,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
477 LSShoutError("LightShare functions are not enabled."); 477 LSShoutError("LightShare functions are not enabled.");
478 return; 478 return;
479 } 479 }
480 if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) 480 if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
481 { 481 {
482 LSShoutError("lsSetWindlightScene can only be used by estate managers or owners."); 482 LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
483 return; 483 return;
@@ -500,7 +500,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
500 LSShoutError("LightShare functions are not enabled."); 500 LSShoutError("LightShare functions are not enabled.");
501 return 0; 501 return 0;
502 } 502 }
503 if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200) 503 if (!World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
504 { 504 {
505 LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners."); 505 LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
506 return 0; 506 return 0;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 2680ad0..fe94b79 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -369,7 +369,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
369 if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ESTATE_MANAGER")) 369 if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ESTATE_MANAGER"))
370 { 370 {
371 //Only Estate Managers may use the function 371 //Only Estate Managers may use the function
372 if (World.RegionInfo.EstateSettings.IsEstateManager(ownerID) && World.RegionInfo.EstateSettings.EstateOwner != ownerID) 372 if (World.RegionInfo.EstateSettings.IsEstateManagerOrOwner(ownerID) && World.RegionInfo.EstateSettings.EstateOwner != ownerID)
373 { 373 {
374 return; 374 return;
375 } 375 }