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

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;