diff options
| author | Richard Linden <none@none> | 2013-06-17 01:20:27 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-17 01:20:27 -0700 |
| commit | 1cb0c974ae410479a1f72dab556ef7c9371970ee (patch) | |
| tree | 91a97b4b05e8085fdad17173b7ca874bb98a8805 /indra/newview/pipeline.cpp | |
| parent | fc88265cffe3553803314c6e895a1e3a3c988171 (diff) | |
| parent | 3f2de87340b1c831ea59e4a3ca960d49f343c9fd (diff) | |
Merge
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index dd5c153d55..7cf30e1661 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2792,7 +2792,7 @@ void LLPipeline::updateGeom(F32 max_dtime) S32 count = 0; - max_dtime = llmax(update_timer.getElapsedTimeF32()+0.001f, LLUnitImplicit<LLUnits::Seconds, F32>(max_dtime)); + max_dtime = llmax(update_timer.getElapsedTimeF32()+0.001f, LLUnitImplicit<F32, LLUnits::Seconds>(max_dtime)); LLSpatialGroup* last_group = NULL; LLSpatialBridge* last_bridge = NULL; |