From e3c5cf99f10f217ef5a0f306557411ffa21b1805 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 16 Jul 2012 17:27:52 -0500
Subject: [PATCH] MAINT-1270 Fix for some flexi prims becoming flat at some
LoDs
---
indra/newview/llflexibleobject.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index c4dca4cb79b..9745bb6d648 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -368,10 +368,11 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
LLPath *path = &volume->getPath();
if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible())
{
- //mVO->markForUpdate(TRUE);
+ BOOL force_update = mSimulateRes == 0 ? TRUE : FALSE;
+
doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0);
- if (mSimulateRes == 0)
+ if (!force_update || !gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE))
{
return; // we did not get updated or initialized, proceeding without can be dangerous
}
--
GitLab