diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index cfec630..916d841 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7186,7 +7186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7186 | UUID key; | 7186 | UUID key; |
7187 | ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition); | 7187 | ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition); |
7188 | 7188 | ||
7189 | if (World.Permissions.CanEditParcelProperties(m_host.OwnerID, land, GroupPowers.LandManageBanned)) | 7189 | if (World.Permissions.CanEditParcelProperties(m_host.OwnerID, land, GroupPowers.LandManageBanned, false)) |
7190 | { | 7190 | { |
7191 | int expires = 0; | 7191 | int expires = 0; |
7192 | if (hours != 0) | 7192 | if (hours != 0) |
@@ -10513,7 +10513,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10513 | // according to the docs, this command only works if script owner and land owner are the same | 10513 | // according to the docs, this command only works if script owner and land owner are the same |
10514 | // lets add estate owners and gods, too, and use the generic permission check. | 10514 | // lets add estate owners and gods, too, and use the generic permission check. |
10515 | ILandObject landObject = World.LandChannel.GetLandObject(m_host.AbsolutePosition); | 10515 | ILandObject landObject = World.LandChannel.GetLandObject(m_host.AbsolutePosition); |
10516 | if (!World.Permissions.CanEditParcelProperties(m_host.OwnerID, landObject, GroupPowers.ChangeMedia)) return; | 10516 | if (!World.Permissions.CanEditParcelProperties(m_host.OwnerID, landObject, GroupPowers.ChangeMedia, false)) return; |
10517 | 10517 | ||
10518 | bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)? | 10518 | bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)? |
10519 | byte loop = 0; | 10519 | byte loop = 0; |
@@ -10956,7 +10956,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10956 | m_host.AddScriptLPS(1); | 10956 | m_host.AddScriptLPS(1); |
10957 | UUID key; | 10957 | UUID key; |
10958 | ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition); | 10958 | ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition); |
10959 | if (World.Permissions.CanEditParcelProperties(m_host.OwnerID, land, GroupPowers.LandManageBanned)) | 10959 | if (World.Permissions.CanEditParcelProperties(m_host.OwnerID, land, GroupPowers.LandManageBanned, false)) |
10960 | { | 10960 | { |
10961 | int expires = 0; | 10961 | int expires = 0; |
10962 | if (hours != 0) | 10962 | if (hours != 0) |
@@ -10997,7 +10997,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10997 | m_host.AddScriptLPS(1); | 10997 | m_host.AddScriptLPS(1); |
10998 | UUID key; | 10998 | UUID key; |
10999 | ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition); | 10999 | ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition); |
11000 | if (World.Permissions.CanEditParcelProperties(m_host.OwnerID, land, GroupPowers.LandManageAllowed)) | 11000 | if (World.Permissions.CanEditParcelProperties(m_host.OwnerID, land, GroupPowers.LandManageAllowed, false)) |
11001 | { | 11001 | { |
11002 | if (UUID.TryParse(avatar, out key)) | 11002 | if (UUID.TryParse(avatar, out key)) |
11003 | { | 11003 | { |
@@ -11024,7 +11024,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11024 | m_host.AddScriptLPS(1); | 11024 | m_host.AddScriptLPS(1); |
11025 | UUID key; | 11025 | UUID key; |
11026 | ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition); | 11026 | ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition); |
11027 | if (World.Permissions.CanEditParcelProperties(m_host.OwnerID, land, GroupPowers.LandManageBanned)) | 11027 | if (World.Permissions.CanEditParcelProperties(m_host.OwnerID, land, GroupPowers.LandManageBanned, false)) |
11028 | { | 11028 | { |
11029 | if (UUID.TryParse(avatar, out key)) | 11029 | if (UUID.TryParse(avatar, out key)) |
11030 | { | 11030 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index c474173..7081416 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1434,7 +1434,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1434 | return; | 1434 | return; |
1435 | } | 1435 | } |
1436 | 1436 | ||
1437 | if (!World.Permissions.CanEditParcelProperties(m_host.OwnerID, startLandObject, GroupPowers.LandOptions)) | 1437 | if (!World.Permissions.CanEditParcelProperties(m_host.OwnerID, startLandObject, GroupPowers.LandOptions, false)) |
1438 | { | 1438 | { |
1439 | OSSLShoutError("You do not have permission to modify the parcel"); | 1439 | OSSLShoutError("You do not have permission to modify the parcel"); |
1440 | return; | 1440 | return; |