livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge MAINT-1270 fix

meow-7.2.2
simon@Simon-PC.lindenlab.com 2012-08-01 13:17:35 -07:00
parent 83f5d0c616 e3c5cf99f1
commit 92a0db2a4f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llflexibleobject.cpp
View File

@ -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
}