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 | e3c5cf99f10f217ef5a0f306557411ffa21b1805 (patch) | |
tree | 16e886fe8faf5105e8848d55e510b6e6d13fdc77 /indra/newview | |
parent | 509408f393b8eb58799678adde801675a4d4d600 (diff) |
MAINT-1270 Fix for some flexi prims becoming flat at some LoDs
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llflexibleobject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index c4dca4cb79..9745bb6d64 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -368,10 +368,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(gAgent, *LLWorld::getInstance(), 0.0); - 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 } |