diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-05-07 09:47:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-07 09:47:37 -0500 |
| commit | 155ddf23363f1d5c534c69f50505faf67e51948f (patch) | |
| tree | 976912ed4fa3bc2af7b0b68201460f08614748b5 /indra/newview/llflexibleobject.cpp | |
| parent | f79548ec68ebcef8f8f83705b65fd59da43c3e26 (diff) | |
| parent | f9473e8afcb624cc1b101195bf15943ec372b56f (diff) | |
Merge pull request #1421 from secondlife/DRTVWR-600-maint-A
Drtvwr 600 maint a
Diffstat (limited to 'indra/newview/llflexibleobject.cpp')
| -rw-r--r-- | indra/newview/llflexibleobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index c619c19493..74298c2b3d 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -433,7 +433,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate() LLPath *path = &volume->getPath(); if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible()) { - bool force_update = mSimulateRes == 0 ? true : false; + bool force_update = mSimulateRes == 0; doIdleUpdate(); if (!force_update || !gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE)) @@ -442,10 +442,10 @@ void LLVolumeImplFlexible::doFlexibleUpdate() } } - if(!mInitialized || !mAttributes) + if (!mInitialized || !mAttributes) { //the object is not visible - return ; + return; } // Fix for MAINT-1894 @@ -456,7 +456,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate() { return; } - + S32 num_sections = 1 << mSimulateRes; F32 secondsThisFrame = mTimer.getElapsedTimeAndResetF32(); |