diff options
author | Homer Horwitz | 2008-10-11 20:53:33 +0000 |
---|---|---|
committer | Homer Horwitz | 2008-10-11 20:53:33 +0000 |
commit | 38a0a68091f0b969901db9644b986e261912105b (patch) | |
tree | ac4e87fbeabb937014878225756588ff2dfa91a0 /OpenSim/Region | |
parent | Fix a path issue i caused in a prior commit (diff) | |
download | opensim-SC_OLD-38a0a68091f0b969901db9644b986e261912105b.zip opensim-SC_OLD-38a0a68091f0b969901db9644b986e261912105b.tar.gz opensim-SC_OLD-38a0a68091f0b969901db9644b986e261912105b.tar.bz2 opensim-SC_OLD-38a0a68091f0b969901db9644b986e261912105b.tar.xz |
* Change permission check for llParcelMediaCommandList to use the permissions
module, thus including estate owners and gods.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 165e213..6bda61e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7190,12 +7190,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7190 | m_host.AddScriptLPS(1); | 7190 | m_host.AddScriptLPS(1); |
7191 | 7191 | ||
7192 | // according to the docs, this command only works if script owner and land owner are the same | 7192 | // according to the docs, this command only works if script owner and land owner are the same |
7193 | UUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); | 7193 | // lets add estate owners and gods, too, and use the generic permission check. |
7194 | if (landowner == UUID.Zero || landowner != m_host.ObjectOwner) return; | 7194 | ILandObject landObject = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); |
7195 | if (!World.ExternalChecks.ExternalChecksCanEditParcel(m_host.ObjectOwner, landObject)) return; | ||
7195 | 7196 | ||
7196 | bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)? | 7197 | bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)? |
7197 | 7198 | ||
7198 | LandData landData = World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); | 7199 | LandData landData = landObject.landData; |
7199 | string url = landData.MediaURL; | 7200 | string url = landData.MediaURL; |
7200 | string texture = landData.MediaID.ToString(); | 7201 | string texture = landData.MediaID.ToString(); |
7201 | bool autoAlign = landData.MediaAutoScale != 0; | 7202 | bool autoAlign = landData.MediaAutoScale != 0; |