diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2014-02-05 16:16:30 -0700 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2014-02-05 16:16:30 -0700 |
commit | a847caade4e112906f86cfbd8511d3414d9546db (patch) | |
tree | 4dfe42c2dc762514b3b5635e1186db86385f49b4 /indra/newview/llflexibleobject.cpp | |
parent | cd9871197c55395f6943c2911e9a7991540adfa4 (diff) |
more fix for a non-finite number assertion in llvolume
Diffstat (limited to 'indra/newview/llflexibleobject.cpp')
-rwxr-xr-x | indra/newview/llflexibleobject.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index 3cd4367891..b64034b945 100755 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -722,13 +722,17 @@ void LLVolumeImplFlexible::preRebuild() if (!mUpdated) { LL_RECORD_BLOCK_TIME(FTM_FLEXI_PREBUILD); - doFlexibleRebuild(); + doFlexibleRebuild(false); } } -void LLVolumeImplFlexible::doFlexibleRebuild() +void LLVolumeImplFlexible::doFlexibleRebuild(bool rebuild_volume) { LLVolume* volume = mVO->getVolume(); + if(rebuild_volume) + { + volume->setDirty(); + } volume->regen(); mUpdated = TRUE; @@ -801,7 +805,7 @@ BOOL LLVolumeImplFlexible::doUpdateGeometry(LLDrawable *drawable) volume->dirtySpatialGroup(); { LL_RECORD_BLOCK_TIME(FTM_FLEXIBLE_REBUILD); - doFlexibleRebuild(); + doFlexibleRebuild(volume->mVolumeChanged); } volume->genBBoxes(isVolumeGlobal()); } |