diff options
| author | Richard Linden <none@none> | 2012-11-12 19:08:14 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-12 19:08:14 -0800 |
| commit | a3e3e8b4ccd96e98da73acf1c584bbfa5a8b2b56 (patch) | |
| tree | 292f11d2570ecf7bb9bf9094f35c45539c2a017d /indra/newview/pipeline.cpp | |
| parent | 0bb0bd514b235948c1a21c81ab0e8ab6223b1990 (diff) | |
SH-3406 WIP convert fast timers to lltrace system
simplified llfasttimer code down to 2 classes
llunit unit conversion now done in floating point or 64 bit integer precision,
depending on source type
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 bf353cd1e0..5ac5ae892a 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2715,7 +2715,7 @@ void LLPipeline::updateGeom(F32 max_dtime) S32 count = 0; - max_dtime = llmax(update_timer.getElapsedTimeF32()+0.001f, max_dtime); + max_dtime = llmax(update_timer.getElapsedTimeF32()+0.001f, LLUnit<LLUnits::Seconds, F32>(max_dtime)); LLSpatialGroup* last_group = NULL; LLSpatialBridge* last_bridge = NULL; |