diff options
| author | Richard Linden <none@none> | 2012-12-06 00:37:15 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-12-06 00:37:15 -0800 |
| commit | 60800dacdd7e9b66ed654af471f2b9e9680cd981 (patch) | |
| tree | f71a65d1ab8a4d277a1ccbd109d852fcc00cba13 /indra/newview/llfasttimerview.cpp | |
| parent | 68967e7b2b9416ff66cb49ae755fb33d7b81d129 (diff) | |
SH-3406 WIP convert fast timers to lltrace system
fixed gcc compile error
made LLCopyOnWritePointer contain an LLPointer, not derive from it
added type trait to control periodicrecording mean value type
Diffstat (limited to 'indra/newview/llfasttimerview.cpp')
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index a06fac6bb6..704b914b78 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -501,7 +501,7 @@ void LLFastTimerView::draw() } else { - ms = frame_recording.getPeriodMean(*idp); + ms = LLUnit<LLUnits::Seconds, F64>(frame_recording.getPeriodMean(*idp)); calls = frame_recording.getPeriodMean(idp->callCount()); } @@ -511,7 +511,7 @@ void LLFastTimerView::draw() } else { - tdesc = llformat("%s [%.1f]",idp->getName().c_str(),ms); + tdesc = llformat("%s [%.1f]",idp->getName().c_str(),ms.value()); } dx = (texth+4) + idp->getDepth()*8; |