diff options
| author | leyla_linden <none@none> | 2011-02-23 16:38:45 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-02-23 16:38:45 -0800 |
| commit | b0e64098ba7dabec0b14d0129efa87b5e5a29df2 (patch) | |
| tree | 1efebf171b17a4eb5a47cfba224a268dfe54e337 /indra/newview/llflexibleobject.cpp | |
| parent | 9f537ad93fe7992bb6d652473a4ac3680320cab5 (diff) | |
| parent | 34428b305a437256f5db170db91506e2d94440e9 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llflexibleobject.cpp')
| -rw-r--r-- | indra/newview/llflexibleobject.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index 689fa72958..bd939d8636 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -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; |