Skip to content
Snippets Groups Projects
Commit 1e0470ac authored by Oz Linden's avatar Oz Linden
Browse files

correct merge error

parent b50f23b8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llflexibleobject.cpp
+ 1
− 1
View file @ 1e0470ac
...@@ -418,7 +418,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate() ...@@ -418,7 +418,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
{ {
BOOL force_update = mSimulateRes == 0 ? TRUE : FALSE; BOOL force_update = mSimulateRes == 0 ? TRUE : FALSE;
doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0); doIdleUpdate();
if (!force_update || !gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE)) if (!force_update || !gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE))
{ {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment