diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-07-16 17:27:52 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-07-16 17:27:52 -0500 |
| commit | 407d227e25e292d37767bbf0406a0bd6846a2509 (patch) | |
| tree | 3ae9b1e52cb8eea2975fa7c20ed785ac06381ae9 /indra/newview/llflexibleobject.cpp | |
| parent | 7cd5f7d479b889c3dcdb4bcd0ee6b65b5b5a025f (diff) | |
MAINT-1270 Fix for some flexi prims becoming flat at some LoDs
Diffstat (limited to 'indra/newview/llflexibleobject.cpp')
| -rw-r--r-- | indra/newview/llflexibleobject.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index 06aac5f529..22c265cb8a 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -364,7 +364,7 @@ void LLVolumeImplFlexible::doIdleUpdate() if (visible) { if (!drawablep->isState(LLDrawable::IN_REBUILD_Q1) && - mVO->getPixelArea() > 256.f) + pixel_area > 256.f) { U32 id; @@ -416,10 +416,11 @@ void LLVolumeImplFlexible::doFlexibleUpdate() LLPath *path = &volume->getPath(); if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible()) { - //mVO->markForUpdate(TRUE); + BOOL force_update = mSimulateRes == 0 ? TRUE : FALSE; + doIdleUpdate(); - if (mSimulateRes == 0) + if (!force_update || !gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE)) { return; // we did not get updated or initialized, proceeding without can be dangerous } |