diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-06-02 12:07:14 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-06-02 12:07:14 -0600 |
| commit | 535842211f3eabb6c436d4bce7e25f8e70d36b2f (patch) | |
| tree | f61c553a21e2062e3aa4b2c8c71ef4bd7e84febc /indra | |
| parent | d4e09e81ca1c6350b5b73c9209baa9b1d5391746 (diff) | |
| parent | 71658a024e03ef11b2531cfc7205c9ef7f72c99b (diff) | |
Automated merge with http://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra')
| -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; |