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 | |
| parent | 1ace064a58daf5bc493ae1fe5a9180db89ea52dc (diff) | |
| parent | b53481354da1ef9d0e4f16ca4b5e72ebfe2bfc88 (diff) | |
merge changes for DRTVWR-190
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/llflexibleobject.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
@@ -343,6 +343,7 @@ eb539c65e6ee26eea2bf373af2d0f4b52dc91289 DRTVWR-177 a8057e1b9a1246b434a27405be35e030f7d28b0c 3.3.4-beta3 4281aa899fb2cedb7a9ca7ce91c5c29d4aa69594 DRTVWR-180 9cd174d3a54d93d409a7c346a15b8bfb40fc58f4 DRTVWR-184 +47f0d08ba7ade0a3905074009067c6d3df7e16ae DRTVWR-190 5c08e1d8edd871807153603b690e3ee9dbb548aa DRTVWR-183 6c75f220b103db1420919c8b635fe53e2177f318 3.3.4-beta4 ab2ffc547c8a8950ff187c4f6c95e5334fab597b 3.3.4-beta5 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 } |