diff options
author | Justin Clark-Casey (justincc) | 2013-03-14 22:09:05 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-03-14 22:09:05 +0000 |
commit | ff6a16b46e334995bce589fe9c9f3854381ee167 (patch) | |
tree | 88d89182f90a6eb6acdf8317b90949d3fddac0fb /OpenSim/Region/ScriptEngine/Shared | |
parent | Fix minor race condition in llGetOmega() where inconsistent results could be ... (diff) | |
download | opensim-SC-ff6a16b46e334995bce589fe9c9f3854381ee167.zip opensim-SC-ff6a16b46e334995bce589fe9c9f3854381ee167.tar.gz opensim-SC-ff6a16b46e334995bce589fe9c9f3854381ee167.tar.bz2 opensim-SC-ff6a16b46e334995bce589fe9c9f3854381ee167.tar.xz |
Fix a minor race condition in llInstantMessage() where slightly wrong origin co-ordinates could be given for a fast moving prim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index d25f673..267dc96 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3105,13 +3105,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3105 | msg.ParentEstateID = 0; //ParentEstateID; | 3105 | msg.ParentEstateID = 0; //ParentEstateID; |
3106 | msg.Position = new Vector3(m_host.AbsolutePosition); | 3106 | msg.Position = new Vector3(m_host.AbsolutePosition); |
3107 | msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; | 3107 | msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; |
3108 | |||
3109 | Vector3 pos = m_host.AbsolutePosition; | ||
3108 | msg.binaryBucket | 3110 | msg.binaryBucket |
3109 | = Util.StringToBytes256( | 3111 | = Util.StringToBytes256( |
3110 | "{0}/{1}/{2}/{3}", | 3112 | "{0}/{1}/{2}/{3}", |
3111 | World.RegionInfo.RegionName, | 3113 | World.RegionInfo.RegionName, |
3112 | (int)Math.Floor(m_host.AbsolutePosition.X), | 3114 | (int)Math.Floor(pos.X), |
3113 | (int)Math.Floor(m_host.AbsolutePosition.Y), | 3115 | (int)Math.Floor(pos.Y), |
3114 | (int)Math.Floor(m_host.AbsolutePosition.Z)); | 3116 | (int)Math.Floor(pos.Z)); |
3115 | 3117 | ||
3116 | if (m_TransferModule != null) | 3118 | if (m_TransferModule != null) |
3117 | { | 3119 | { |