From 24e2e7f0d3898ac84953f2b76b6b1b01c915e7db Mon Sep 17 00:00:00 2001 From: Shyotl Date: Thu, 16 Jun 2011 22:50:04 -0500 Subject: [PATCH] Back to LL's flexi handling since they fixed updating their own way. --- indra/newview/llflexibleobject.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index 317ad0eb9..6ce035e5b 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -366,10 +366,8 @@ void LLVolumeImplFlexible::doFlexibleUpdate() { LLVolume* volume = mVO->getVolume(); LLPath *path = &volume->getPath(); - if ((mSimulateRes == 0 || !mInitialized)) // if its uninitialized but not visible, what then? - Nyx + if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible()) { - //if(mInitialized && !mVO->mDrawable->isVisible()) - // return; //avoiding the assert below... mVO->markForUpdate(TRUE); if (!doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0)) { @@ -377,7 +375,11 @@ void LLVolumeImplFlexible::doFlexibleUpdate() } } - llassert_always(mInitialized); + if(!mInitialized) + { + //the object is not visible + return ; + } S32 num_sections = 1 << mSimulateRes;