diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-06 11:48:10 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-06 11:48:10 -0800 |
| commit | 236eefd9c8afbdd1f9e8b32cd8d356a6c0b6b2ac (patch) | |
| tree | a4a1771e1827feb064dc9531edbe800f5f702f32 | |
| parent | 82c92ce5a97d6a83505c775348aef692e18e42ed (diff) | |
| parent | 2ea750ebcad8335aeb0ec77a483831b62d05f643 (diff) | |
Merge
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/lldrawable.cpp | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index e86ef11a72..10c935f9bb 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -748,6 +748,7 @@ Marine Kelley MartinRJ Fayray STORM-1844 STORM-1845 + STORM-1934 Matthew Anthony Matthew Dowd VWR-1344 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(); |