diff options
author | mingchen | 2008-05-08 19:37:57 +0000 |
---|---|---|
committer | mingchen | 2008-05-08 19:37:57 +0000 |
commit | 6c71a04da8150f7948df7a43f532e525d44cc4e7 (patch) | |
tree | e9ed76fd72fa84f9aad4ff5dec66972e08e93b82 /OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs | |
parent | * Committing an extra bit of permissions for attaching to ensure that the per... (diff) | |
download | opensim-SC-6c71a04da8150f7948df7a43f532e525d44cc4e7.zip opensim-SC-6c71a04da8150f7948df7a43f532e525d44cc4e7.tar.gz opensim-SC-6c71a04da8150f7948df7a43f532e525d44cc4e7.tar.bz2 opensim-SC-6c71a04da8150f7948df7a43f532e525d44cc4e7.tar.xz |
*Added all the permission checks to the sceneexternalchecks and modified permission module to follow this.
*This makes permission checking much more modular; allows restrictive and granting module to be made without modifying the existing permission module
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs index ddca617..401042a 100644 --- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs | |||
@@ -258,7 +258,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
258 | if (x > 255 || x < 0 || y > 255 || y < 0) | 258 | if (x > 255 || x < 0 || y > 255 || y < 0) |
259 | LSLError("osTerrainSetHeight: Coordinate out of bounds"); | 259 | LSLError("osTerrainSetHeight: Coordinate out of bounds"); |
260 | 260 | ||
261 | if (World.Permissions.CanTerraform(m_host.OwnerID, new LLVector3(x, y, 0))) | 261 | if (World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new LLVector3(x, y, 0))) |
262 | { | 262 | { |
263 | World.Heightmap[x, y] = val; | 263 | World.Heightmap[x, y] = val; |
264 | return 1; | 264 | return 1; |
@@ -281,7 +281,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
281 | public int osRegionRestart(double seconds) | 281 | public int osRegionRestart(double seconds) |
282 | { | 282 | { |
283 | m_host.AddScriptLPS(1); | 283 | m_host.AddScriptLPS(1); |
284 | if (World.Permissions.CanRestartSim(m_host.OwnerID)) | 284 | if (World.ExternalChecks.ExternalChecksCanRestartSim(m_host.OwnerID)) |
285 | { | 285 | { |
286 | World.Restart((float)seconds); | 286 | World.Restart((float)seconds); |
287 | return 1; | 287 | return 1; |
@@ -406,7 +406,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
406 | 406 | ||
407 | if (config.Configs["LL-Functions"].GetBoolean("AllowosConsoleCommand", false)) | 407 | if (config.Configs["LL-Functions"].GetBoolean("AllowosConsoleCommand", false)) |
408 | { | 408 | { |
409 | if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID)) | 409 | if (World.ExternalChecks.ExternalChecksCanRunConsoleCommand(m_host.OwnerID)) |
410 | { | 410 | { |
411 | MainConsole.Instance.RunCommand(command); | 411 | MainConsole.Instance.RunCommand(command); |
412 | return true; | 412 | return true; |