diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2016-07-25 08:49:19 +0300 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2016-07-25 08:49:19 +0300 |
| commit | 7a58ae0f17ec495f32b7e2383f7313db6101119c (patch) | |
| tree | 6e6d67ffd6ee5b9135082bf4aaa54a245cf30462 | |
| parent | d66d8e727a377705a8be2a3de7930efe200c81c3 (diff) | |
| parent | 62e7640ad5b0b183290e94b2950fd6288bd3d31c (diff) | |
Merged in ruslantproductengine/viewer-neko-ruslant-4-cr (pull request #3)
MAINT-6125 Mesh avatar deforms constantly
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 023f1b92ba..86591ff4df 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -465,7 +465,7 @@ LLViewerOctreeGroup::LLViewerOctreeGroup(OctreeNode* node) { LLVector4a tmp; tmp.splat(0.f); - mExtents[0] = mExtents[1] = mObjectBounds[0] = mObjectBounds[0] = mObjectBounds[1] = + mExtents[0] = mExtents[1] = mObjectBounds[0] = mObjectBounds[1] = mObjectExtents[0] = mObjectExtents[1] = tmp; mBounds[0] = node->getCenter(); diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 486f6fae61..fde997d54e 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1753,7 +1753,10 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable) dirtySpatialGroup(drawable->isState(LLDrawable::IN_REBUILD_Q1)); compiled = TRUE; lodOrSculptChanged(drawable, compiled); - genBBoxes(FALSE); + if (!mLODChanged) + { + genBBoxes(FALSE); + } } // it has its own drawable (it's moved) or it has changed UVs or it has changed xforms from global<->local else |