aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie2011-10-11 22:11:44 +0100
committerMelanie2011-10-11 22:11:44 +0100
commit6978ae0a592bf357373377324bee51032aa21d3c (patch)
tree6d24c511977e38923e63492b08bad4cbd4e5829c /OpenSim/Region/ScriptEngine/Shared
parentMerge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge (diff)
parentRemove setter from SP.OffsetPosition, since all sets should flow through SP.A... (diff)
downloadopensim-SC-6978ae0a592bf357373377324bee51032aa21d3c.zip
opensim-SC-6978ae0a592bf357373377324bee51032aa21d3c.tar.gz
opensim-SC-6978ae0a592bf357373377324bee51032aa21d3c.tar.bz2
opensim-SC-6978ae0a592bf357373377324bee51032aa21d3c.tar.xz
Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 1 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 769c84e..4f21c67 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7481,7 +7481,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7481 return; 7481 return;
7482 LSL_Vector v; 7482 LSL_Vector v;
7483 v = rules.GetVector3Item(idx++); 7483 v = rules.GetVector3Item(idx++);
7484 av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z); 7484 av.AbsolutePosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
7485 av.SendAvatarDataToAllAgents(); 7485 av.SendAvatarDataToAllAgents();
7486 7486
7487 break; 7487 break;