diff options
| author | Justin Clark-Casey (justincc) | 2013-03-14 22:45:00 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-03-14 22:45:00 +0000 |
| commit | d4b109b4c4c9bc548bfbfa4b0c6d021cfa38bee3 (patch) | |
| tree | 769dd9b03aeda6fe0a130cd1013435fbe50f7fdb /OpenSim | |
| parent | Fix minor race conditions in LSL_Api.GetPrimParams() for PRIM_POSITION, PRIM_... (diff) | |
| download | opensim-SC_OLD-d4b109b4c4c9bc548bfbfa4b0c6d021cfa38bee3.zip opensim-SC_OLD-d4b109b4c4c9bc548bfbfa4b0c6d021cfa38bee3.tar.gz opensim-SC_OLD-d4b109b4c4c9bc548bfbfa4b0c6d021cfa38bee3.tar.bz2 opensim-SC_OLD-d4b109b4c4c9bc548bfbfa4b0c6d021cfa38bee3.tar.xz | |
Fix minor race condition in llParcelMediaCommandList() where a parcel could be misidentified for a moving prim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8d5eea3..1b98bd8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -9595,7 +9595,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 9595 | 9595 | ||
| 9596 | // according to the docs, this command only works if script owner and land owner are the same | 9596 | // according to the docs, this command only works if script owner and land owner are the same |
| 9597 | // lets add estate owners and gods, too, and use the generic permission check. | 9597 | // lets add estate owners and gods, too, and use the generic permission check. |
| 9598 | ILandObject landObject = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); | 9598 | Vector3 pos = m_host.AbsolutePosition; |
| 9599 | |||
| 9600 | ILandObject landObject = World.LandChannel.GetLandObject(pos.X, pos.Y); | ||
| 9599 | if (!World.Permissions.CanEditParcelProperties(m_host.OwnerID, landObject, GroupPowers.ChangeMedia)) return; | 9601 | if (!World.Permissions.CanEditParcelProperties(m_host.OwnerID, landObject, GroupPowers.ChangeMedia)) return; |
| 9600 | 9602 | ||
| 9601 | bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)? | 9603 | bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)? |