diff options
| author | Tofu Buzzard <no-email> | 2011-02-17 12:14:46 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-17 12:14:46 -0800 |
| commit | 03c738d0c9df57a786803a292bc766e78d014749 (patch) | |
| tree | 08c8e8529056d12240fa4e71987b54c2ce28d2f4 /indra/newview/llflexibleobject.cpp | |
| parent | d8e04b9d31b0c77289f5f770f2a9b54506650151 (diff) | |
| parent | 3362fc17f93cbd7e6bfa23dc7af64ef749609ee2 (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; |