diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-14 12:41:48 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-14 12:41:48 -0400 |
| commit | 1e0470ac56aff52c6b44d503778d09676f5fce4a (patch) | |
| tree | b3abab7a5468473c268ee0ac31ddedcaf49e5cae /indra/newview | |
| parent | b50f23b899db1b2dfce34d2b5ff5be6ec84eec8b (diff) | |
correct merge error
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llflexibleobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index 56dc0b4157..ef412a6bbf 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)) { |