diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-08-01 13:17:35 -0700 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-08-01 13:17:35 -0700 |
| commit | 92a0db2a4f5397067e087068f736181e618e9c0a (patch) | |
| tree | 3ad1a25deea567856ec24e092a77696d0b6190f9 /indra/newview | |
| parent | 83f5d0c61667ae7682893adbb8939f77b28c2201 (diff) | |
| parent | e3c5cf99f10f217ef5a0f306557411ffa21b1805 (diff) | |
Merge MAINT-1270 fix
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llflexibleobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index 06aac5f529..eca964442b 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -416,10 +416,10 @@ 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 } |