diff options
author | Melanie | 2010-07-31 01:05:13 +0100 |
---|---|---|
committer | Melanie | 2010-07-31 01:05:13 +0100 |
commit | dd2d9a68a7733962d111da5994c673cbd1329a97 (patch) | |
tree | a095b1e3ec9ea1c1f06ec580915cd7afb5dc29e4 /OpenSim/Region/ScriptEngine/Shared | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Thank you, Snoopy, for a patch to fix child prim movement. This still doesn't (diff) | |
download | opensim-SC-dd2d9a68a7733962d111da5994c673cbd1329a97.zip opensim-SC-dd2d9a68a7733962d111da5994c673cbd1329a97.tar.gz opensim-SC-dd2d9a68a7733962d111da5994c673cbd1329a97.tar.bz2 opensim-SC-dd2d9a68a7733962d111da5994c673cbd1329a97.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-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 15af8b1..c08c246 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2116,13 +2116,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2116 | } | 2116 | } |
2117 | else | 2117 | else |
2118 | { | 2118 | { |
2119 | if (llVecDist(new LSL_Vector(0,0,0), targetPos) <= 10.0f) | 2119 | LSL_Vector rel_vec = SetPosAdjust(currentPos, targetPos); |
2120 | { | 2120 | part.OffsetPosition = new Vector3((float)rel_vec.x, (float)rel_vec.y, (float)rel_vec.z); |
2121 | part.OffsetPosition = new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z); | 2121 | SceneObjectGroup parent = part.ParentGroup; |
2122 | SceneObjectGroup parent = part.ParentGroup; | 2122 | parent.HasGroupChanged = true; |
2123 | parent.HasGroupChanged = true; | 2123 | parent.ScheduleGroupForTerseUpdate(); |
2124 | parent.ScheduleGroupForTerseUpdate(); | ||
2125 | } | ||
2126 | } | 2124 | } |
2127 | } | 2125 | } |
2128 | 2126 | ||