diff options
author | Melanie | 2010-07-31 01:03:14 +0100 |
---|---|---|
committer | Melanie | 2010-07-31 01:03:14 +0100 |
commit | 168a8e9ae5bd36bbe393f36e9a9ff17dbd4699ca (patch) | |
tree | 755b613423e453d1230d375b0d642ee0bf2a3365 /OpenSim | |
parent | Slight improvement on previous commit. (diff) | |
download | opensim-SC-168a8e9ae5bd36bbe393f36e9a9ff17dbd4699ca.zip opensim-SC-168a8e9ae5bd36bbe393f36e9a9ff17dbd4699ca.tar.gz opensim-SC-168a8e9ae5bd36bbe393f36e9a9ff17dbd4699ca.tar.bz2 opensim-SC-168a8e9ae5bd36bbe393f36e9a9ff17dbd4699ca.tar.xz |
Thank you, Snoopy, for a patch to fix child prim movement. This still doesn't
address limiting link distance, but at least it makes the UI and LSL
match.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 6edd08d..525f0f0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -1934,13 +1934,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1934 | } | 1934 | } |
1935 | else | 1935 | else |
1936 | { | 1936 | { |
1937 | if (llVecDist(new LSL_Vector(0,0,0), targetPos) <= 10.0f) | 1937 | LSL_Vector rel_vec = SetPosAdjust(currentPos, targetPos); |
1938 | { | 1938 | part.OffsetPosition = new Vector3((float)rel_vec.x, (float)rel_vec.y, (float)rel_vec.z); |
1939 | part.OffsetPosition = new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z); | 1939 | SceneObjectGroup parent = part.ParentGroup; |
1940 | SceneObjectGroup parent = part.ParentGroup; | 1940 | parent.HasGroupChanged = true; |
1941 | parent.HasGroupChanged = true; | 1941 | parent.ScheduleGroupForTerseUpdate(); |
1942 | parent.ScheduleGroupForTerseUpdate(); | ||
1943 | } | ||
1944 | } | 1942 | } |
1945 | } | 1943 | } |
1946 | 1944 | ||