diff options
| author | Diva Canto | 2010-07-30 18:07:50 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-07-30 18:07:50 -0700 |
| commit | ed59dcd422cea35de97f8d25dd06fc24f07fc503 (patch) | |
| tree | f36628da71c9b24b5ca1a83862e3da3977b70924 /OpenSim | |
| parent | Bug fix: make m_HypergridLinker static. (diff) | |
| parent | Thank you, Snoopy, for a patch to fix child prim movement. This still doesn't (diff) | |
| download | opensim-SC_OLD-ed59dcd422cea35de97f8d25dd06fc24f07fc503.zip opensim-SC_OLD-ed59dcd422cea35de97f8d25dd06fc24f07fc503.tar.gz opensim-SC_OLD-ed59dcd422cea35de97f8d25dd06fc24f07fc503.tar.bz2 opensim-SC_OLD-ed59dcd422cea35de97f8d25dd06fc24f07fc503.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
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 | ||