diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-05 17:46:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-05 17:46:19 -0500 |
| commit | 4989bf5562fb9a2da8454c7eb8d2f5c33f9663ea (patch) | |
| tree | 756cc63fdb355ea3f0f85a5c2ac8e92203574f24 /indra | |
| parent | 96225b44247fc991d5ad2d856cde7d9f9aef412b (diff) | |
| parent | 2ea750ebcad8335aeb0ec77a483831b62d05f643 (diff) | |
merge changes for child prim movement
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index ba1759f642..4b0d3b361d 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -577,6 +577,12 @@ F32 LLDrawable::updateXform(BOOL undamped) mVObjp->dirtySpatialGroup(); } } + else if (!isRoot() && + ((dist_vec_squared(old_pos, target_pos) > 0.f) + || (1.f - dot(old_rot, target_rot)) > 0.f)) + { //fix for BUG-840, MAINT-2275, MAINT-1742, MAINT-2247 + gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE); + } else if (!getVOVolume() && !isAvatar()) { movePartition(); |