diff options
| author | Richard Linden <none@none> | 2011-06-23 11:35:14 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-23 11:35:14 -0700 |
| commit | af142618f9c18a418bd11ab8eae6c83caa03ddac (patch) | |
| tree | fbdfb3f954bf68df568c1dc898b0dc261ad77873 /indra/newview/llflexibleobject.cpp | |
| parent | ae2cbe5258ad76e22420be2760379480e10fb72c (diff) | |
| parent | 70fc5af53ffc39c3c0ef32b99a6c83e972b8a117 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llflexibleobject.cpp')
| -rw-r--r-- | indra/newview/llflexibleobject.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index 3d1650d2f5..32a533570a 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 || !mInitialized) && mVO->mDrawable->isVisible()) // if its uninitialized but not visible, what then? - Nyx + if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible()) { mVO->markForUpdate(TRUE); if (!doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0)) @@ -375,7 +375,11 @@ void LLVolumeImplFlexible::doFlexibleUpdate() } } - llassert_always(mInitialized); + if(!mInitialized) + { + //the object is not visible + return ; + } S32 num_sections = 1 << mSimulateRes; |