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

Automated merge with https://hg.secondlife.com/mesh-development

meow-7.2.2
Nyx (Neal Orman) 2011-02-17 13:53:04 -05:00
parent 5c2f5b0013 019585ed6c
commit 0ba198b94b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llflexibleobject.cpp
View File

@ -366,7 +366,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
LLFastTimer ftm(FTM_DO_FLEXIBLE_UPDATE);
LLVolume* volume = mVO->getVolume();
LLPath *path = &volume->getPath();
if (mSimulateRes == 0 && mVO->mDrawable->isVisible())
if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible())
{
mVO->markForUpdate(TRUE);
if (!doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0))
@ -375,6 +375,11 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
}
}
if (!mVO->mDrawable->isVisible())
{
return;
}
llassert_always(mInitialized);
S32 num_sections = 1 << mSimulateRes;