diff options
author | Richard Linden <none@none> | 2012-10-17 20:00:07 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-10-17 20:00:07 -0700 |
commit | a52d203a4f1d2988e8ffba16258f3f132f22f56d (patch) | |
tree | ce95e59210aa9228b92dc2abc8d5a8028e63d4cd /indra/llui | |
parent | e6ca5471a2a816a24888ae1b38332531b22b7254 (diff) |
SH-3405 WIP convert existing stats to lltrace system
started conversion of llviewerassetstats
removed old, dead LLViewerStats code
made units tracing require units declaration
clean up of units handling
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/llstatbar.cpp | 3 | ||||
-rw-r--r-- | indra/llui/llstatbar.h | 2 | ||||
-rw-r--r-- | indra/llui/llstatgraph.h | 10 |
3 files changed, 7 insertions, 8 deletions
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp index c60e5431ae..535c6f96e3 100644 --- a/indra/llui/llstatbar.cpp +++ b/indra/llui/llstatbar.cpp @@ -56,8 +56,7 @@ LLStatBar::LLStatBar(const Params& p) mDisplayBar(p.show_bar), mDisplayHistory(p.show_history), mDisplayMean(p.show_mean) -{ -} +{} BOOL LLStatBar::handleMouseDown(S32 x, S32 y, MASK mask) { diff --git a/indra/llui/llstatbar.h b/indra/llui/llstatbar.h index e4b0c61c42..d510f0e3fe 100644 --- a/indra/llui/llstatbar.h +++ b/indra/llui/llstatbar.h @@ -99,7 +99,7 @@ private: LLTrace::PeriodicRecording* mFrameRecording; LLStat* mStatp; - LLTrace::Count<>* mNewStatp; + LLTrace::count_common_t* mNewStatp; LLFrameTimer mUpdateTimer; LLUIString mLabel; diff --git a/indra/llui/llstatgraph.h b/indra/llui/llstatgraph.h index 5bbd9e9d24..b20966d608 100644 --- a/indra/llui/llstatgraph.h +++ b/indra/llui/llstatgraph.h @@ -59,9 +59,9 @@ public: struct StatParams : public LLInitParam::ChoiceBlock<StatParams> { - Alternative<LLStat*> legacy_stat; - Alternative<LLTrace::Count<>* > count_stat; - Alternative<LLTrace::Measurement<>* > measurement_stat; + Alternative<LLStat*> legacy_stat; + Alternative<LLTrace::count_common_t* > count_stat; + Alternative<LLTrace::measurement_common_t* > measurement_stat; }; struct Params : public LLInitParam::Block<Params, LLView::Params> @@ -106,8 +106,8 @@ public: /*virtual*/ void setValue(const LLSD& value); private: - LLStat* mStatp; - LLTrace::Count<>* mNewStatp; + LLStat* mStatp; + LLTrace::count_common_t* mNewStatp; BOOL mPerSec; |