From 1e0470ac56aff52c6b44d503778d09676f5fce4a Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 14 Aug 2012 12:41:48 -0400
Subject: [PATCH] correct merge error
---
indra/newview/llflexibleobject.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index 56dc0b4157f..ef412a6bbf2 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -418,7 +418,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
{
BOOL force_update = mSimulateRes == 0 ? TRUE : FALSE;
- doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0);
+ doIdleUpdate();
if (!force_update || !gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE))
{
--
GitLab