summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-02-17 13:53:04 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-02-17 13:53:04 -0500
commit0ba198b94b85979bc970f2fcabf9df652d94e669 (patch)
treebca172de1f5b863960f18c7f006b62f03aec55ca /indra
parent5c2f5b0013e7a0dad8b92e9714895fdb60398611 (diff)
parent019585ed6c761a32b5d06990d7cf55388905113a (diff)
Automated merge with https://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llflexibleobject.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index 689fa72958..bd939d8636 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 && mVO->mDrawable->isVisible())
+ if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible())
{
mVO->markForUpdate(TRUE);
if (!doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0))
@@ -375,6 +375,11 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
}
}
+ if (!mVO->mDrawable->isVisible())
+ {
+ return;
+ }
+
llassert_always(mInitialized);
S32 num_sections = 1 << mSimulateRes;