diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index e3bec9d..48b356a 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -181,7 +181,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
181 | m_host.AddScriptLPS(1); | 181 | m_host.AddScriptLPS(1); |
182 | //Check to make sure that the script's owner is the estate manager/master | 182 | //Check to make sure that the script's owner is the estate manager/master |
183 | //World.Permissions.GenericEstatePermission( | 183 | //World.Permissions.GenericEstatePermission( |
184 | if (World.Permissions.GenericEstatePermission(m_host.OwnerID)) | 184 | if (World.ExternalChecks.ExternalChecksCanBeGodLike(m_host.OwnerID)) |
185 | { | 185 | { |
186 | World.EventManager.TriggerRequestChangeWaterHeight((float)height); | 186 | World.EventManager.TriggerRequestChangeWaterHeight((float)height); |
187 | } | 187 | } |
@@ -2647,7 +2647,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2647 | public void llModifyLand(int action, int brush) | 2647 | public void llModifyLand(int action, int brush) |
2648 | { | 2648 | { |
2649 | m_host.AddScriptLPS(1); | 2649 | m_host.AddScriptLPS(1); |
2650 | if (World.Permissions.CanTerraform(m_host.OwnerID, new LLVector3(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, 0))) | 2650 | if (World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new LLVector3(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, 0))) |
2651 | { | 2651 | { |
2652 | NotImplemented("llModifyLand"); | 2652 | NotImplemented("llModifyLand"); |
2653 | } | 2653 | } |
@@ -3900,7 +3900,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
3900 | { | 3900 | { |
3901 | if (m_host.ObjectOwner == parcel.landData.ownerID || | 3901 | if (m_host.ObjectOwner == parcel.landData.ownerID || |
3902 | (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.groupID | 3902 | (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.groupID |
3903 | && parcel.landData.isGroupOwned) || World.Permissions.GenericEstatePermission(m_host.OwnerID)) | 3903 | && parcel.landData.isGroupOwned) || World.ExternalChecks.ExternalChecksCanBeGodLike(m_host.OwnerID)) |
3904 | { | 3904 | { |
3905 | av.StandUp(); | 3905 | av.StandUp(); |
3906 | } | 3906 | } |
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; |