diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-10 08:08:55 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-10 08:08:55 -0700 |
| commit | 2c2167229eac3efd7e7b1c5eafde8ee2e66184cd (patch) | |
| tree | fe9de714508b2c47d44a1a4178cb7eef948df716 /indra/newview | |
| parent | 1ace064a58daf5bc493ae1fe5a9180db89ea52dc (diff) | |
| parent | b53481354da1ef9d0e4f16ca4b5e72ebfe2bfc88 (diff) | |
merge changes for DRTVWR-190
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 } |