aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-21 22:14:57 +0000
committerMelanie Thielker2008-11-21 22:14:57 +0000
commitba723a4cf65e7a82f5072eaab51dc008f4a2bfd9 (patch)
treedb636daea691f80b0d8bfd3970b8ced36ef9ced0 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parent* Comment out unused access time method in MSSQL (diff)
downloadopensim-SC-ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9.zip
opensim-SC-ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9.tar.gz
opensim-SC-ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9.tar.bz2
opensim-SC-ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9.tar.xz
Refactor: Scene.ExternalChecks -> Scene.Permissions. Also make all
the internals of the permissions module adapter sane
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs8
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 15ce756..7ccd71c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5111,7 +5111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5111 { 5111 {
5112 if (m_host.ObjectOwner == parcel.landData.OwnerID || 5112 if (m_host.ObjectOwner == parcel.landData.OwnerID ||
5113 (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.GroupID 5113 (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.GroupID
5114 && parcel.landData.IsGroupOwned) || World.ExternalChecks.ExternalChecksCanBeGodLike(m_host.OwnerID)) 5114 && parcel.landData.IsGroupOwned) || World.Permissions.IsGod(m_host.OwnerID))
5115 { 5115 {
5116 av.StandUp(); 5116 av.StandUp();
5117 } 5117 }
@@ -7408,7 +7408,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7408 7408
7409 if (config.Configs["XEngine"].GetBoolean("AllowGodFunctions", false)) 7409 if (config.Configs["XEngine"].GetBoolean("AllowGodFunctions", false))
7410 { 7410 {
7411 if (World.ExternalChecks.ExternalChecksCanRunConsoleCommand(m_host.OwnerID)) 7411 if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
7412 { 7412 {
7413 if (mask == ScriptBaseClass.MASK_BASE)//0 7413 if (mask == ScriptBaseClass.MASK_BASE)//0
7414 { 7414 {
@@ -7701,7 +7701,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7701 // according to the docs, this command only works if script owner and land owner are the same 7701 // according to the docs, this command only works if script owner and land owner are the same
7702 // lets add estate owners and gods, too, and use the generic permission check. 7702 // lets add estate owners and gods, too, and use the generic permission check.
7703 ILandObject landObject = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); 7703 ILandObject landObject = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
7704 if (!World.ExternalChecks.ExternalChecksCanEditParcel(m_host.ObjectOwner, landObject)) return; 7704 if (!World.Permissions.CanEditParcel(m_host.ObjectOwner, landObject)) return;
7705 7705
7706 bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)? 7706 bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)?
7707 7707
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 3d1fe3b..08c2f2f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -276,7 +276,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
276 if (x > 255 || x < 0 || y > 255 || y < 0) 276 if (x > 255 || x < 0 || y > 255 || y < 0)
277 OSSLError("osTerrainSetHeight: Coordinate out of bounds"); 277 OSSLError("osTerrainSetHeight: Coordinate out of bounds");
278 278
279 if (World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new Vector3(x, y, 0))) 279 if (World.Permissions.CanTerraformLand(m_host.OwnerID, new Vector3(x, y, 0)))
280 { 280 {
281 World.Heightmap[x, y] = val; 281 World.Heightmap[x, y] = val;
282 return 1; 282 return 1;
@@ -309,7 +309,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
309 CheckThreatLevel(ThreatLevel.High, "osRegionRestart"); 309 CheckThreatLevel(ThreatLevel.High, "osRegionRestart");
310 310
311 m_host.AddScriptLPS(1); 311 m_host.AddScriptLPS(1);
312 if (World.ExternalChecks.ExternalChecksCanIssueEstateCommand(m_host.OwnerID, false)) 312 if (World.Permissions.CanIssueEstateCommand(m_host.OwnerID, false))
313 { 313 {
314 World.Restart((float)seconds); 314 World.Restart((float)seconds);
315 return 1; 315 return 1;
@@ -461,7 +461,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
461 461
462 m_host.AddScriptLPS(1); 462 m_host.AddScriptLPS(1);
463 463
464 if (World.ExternalChecks.ExternalChecksCanRunConsoleCommand(m_host.OwnerID)) 464 if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
465 { 465 {
466 MainConsole.Instance.RunCommand(command); 466 MainConsole.Instance.RunCommand(command);
467 return true; 467 return true;
@@ -663,7 +663,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
663 m_host.AddScriptLPS(1); 663 m_host.AddScriptLPS(1);
664 //Check to make sure that the script's owner is the estate manager/master 664 //Check to make sure that the script's owner is the estate manager/master
665 //World.Permissions.GenericEstatePermission( 665 //World.Permissions.GenericEstatePermission(
666 if (World.ExternalChecks.ExternalChecksCanBeGodLike(m_host.OwnerID)) 666 if (World.Permissions.IsGod(m_host.OwnerID))
667 { 667 {
668 World.EventManager.TriggerRequestChangeWaterHeight((float)height); 668 World.EventManager.TriggerRequestChangeWaterHeight((float)height);
669 } 669 }