diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-02 17:34:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-02 17:34:12 -0400 |
| commit | 4a3916630ccf60c8ce89f08817587740318803bb (patch) | |
| tree | b7df22d7cb7412d1c68c59c91234f8b28b1063d2 | |
| parent | 361384ebb9f41dbccbaab779a085edb773f0a734 (diff) | |
| parent | d5041f5fb0850f71474f0b6a37e15ef322c509a7 (diff) | |
merge changes back from beta branch for SH-1691
| -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; |