diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-07 13:42:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-07 13:42:46 -0400 |
| commit | 3311b1bffc8d14f2d5b1ab0d0fbe91b04ee17df8 (patch) | |
| tree | beff520bbdca9f7a8aeeb7d4fc21b4a16b8b510c /indra/newview/llflexibleobject.cpp | |
| parent | 88407a0f0c19f1ee36c176f2fdc2117646d65b80 (diff) | |
| parent | bde49506e5b1a854f832f6f47781eac35853b1a0 (diff) | |
merge latest builds from project integration repo
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; |