diff options
| author | Richard Linden <none@none> | 2012-12-07 15:20:12 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-12-07 15:20:12 -0800 |
| commit | c99886d94389babc78e92bbfa5084fdd785915af (patch) | |
| tree | 839ffe3031ca296182743cf7af4d7375e2fb3c78 /indra/newview/pipeline.cpp | |
| parent | 3745d1254acc386acaadd20016123c9a47b8d10c (diff) | |
SH-3406 WIP convert fast timers to lltrace system
improved unit tests for LLUnit
renamed LLUnit to LLUnitImplicit with LLUnit being reserved for
explicit units
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | 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 813fc7db6a..3be19c3920 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2747,7 +2747,7 @@ void LLPipeline::updateGeom(F32 max_dtime) S32 count = 0; - max_dtime = llmax(update_timer.getElapsedTimeF32()+0.001f, LLUnit<LLUnits::Seconds, F32>(max_dtime)); + max_dtime = llmax(update_timer.getElapsedTimeF32()+0.001f, LLUnitImplicit<LLUnits::Seconds, F32>(max_dtime)); LLSpatialGroup* last_group = NULL; LLSpatialBridge* last_bridge = NULL; |