diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-05-30 17:39:09 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-05-30 17:39:09 +0000 |
| commit | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (patch) | |
| tree | ab3877f764cc27dbdca0b683f07e6ea3a3ac8a23 /indra/newview/llflexibleobject.cpp | |
| parent | 7b61f1d0ec30e97fd3b7c5caf4b0e675c6e9a1f5 (diff) | |
merge -r61423:62602 svn/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llflexibleobject.cpp')
| -rw-r--r-- | indra/newview/llflexibleobject.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index 2b11653da0..5a7a12c38d 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -42,6 +42,7 @@ LLVolumeImplFlexible::LLVolumeImplFlexible(LLViewerObject* vo, LLFlexibleObjectD mInitializedRes = -1; mSimulateRes = 0; mFrameNum = 0; + mRenderRes = 1; }//----------------------------------------------- LLVector3 LLVolumeImplFlexible::getFramePosition() const @@ -233,7 +234,7 @@ BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6 { if (!gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE)) { - return TRUE; + return FALSE; // (we are not initialized or updated) } LLFastTimer ftm(LLFastTimer::FTM_FLEXIBLE_UPDATE); @@ -241,7 +242,7 @@ BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6 if (mVO->mDrawable.isNull()) { // Don't do anything until we have a drawable - return TRUE; + return FALSE; // (we are not initialized or updated) } //flexible objects never go static @@ -326,8 +327,13 @@ void LLVolumeImplFlexible::doFlexibleUpdate() if (mSimulateRes == 0) { mVO->markForUpdate(TRUE); - doIdleUpdate(gAgent, *gWorldp, 0.0); + if (!doIdleUpdate(gAgent, *gWorldp, 0.0)) + { + return; // we did not get updated or initialized, proceeding without can be dangerous + } } + + llassert_always(mInitialized); S32 num_sections = 1 << mSimulateRes; |