diff options
| author | Richard Linden <none@none> | 2012-08-30 19:24:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-30 19:24:07 -0700 |
| commit | 88e455a3a536bae39a0c83ae9bc43cc1252ed4c0 (patch) | |
| tree | 58f4ce4cd3396c1b13b430744ce3e91ce0fa28b2 /indra/llui | |
| parent | d48889198b9f5b39c195e237ae253339b2d89ef3 (diff) | |
| parent | aaac4c7df5858a2dfc385b195446476947244dad (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llstatbar.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llstatbar.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp index 04cce7878e..a21d7aa6a1 100644 --- a/indra/llui/llstatbar.cpp +++ b/indra/llui/llstatbar.cpp @@ -45,7 +45,7 @@ LLStatBar::LLStatBar(const Params& p) mUnitLabel(p.unit_label), mMinBar(p.bar_min), mMaxBar(p.bar_max), - mStatp(LLStat::getStat(p.stat)), + mStatp(LLStat::getInstance(p.stat)), mTickSpacing(p.tick_spacing), mLabelSpacing(p.label_spacing), mPrecision(p.precision), diff --git a/indra/llui/llstatbar.h b/indra/llui/llstatbar.h index 513fff3234..7e636d0aa7 100644 --- a/indra/llui/llstatbar.h +++ b/indra/llui/llstatbar.h @@ -59,10 +59,10 @@ public: label_spacing("label_spacing", 10.0f), precision("precision", 0), update_rate("update_rate", 5.0f), - show_per_sec("show_per_sec", TRUE), + show_per_sec("show_per_sec", true), show_bar("show_bar", TRUE), - show_history("show_history", FALSE), - show_mean("show_mean", TRUE), + show_history("show_history", false), + show_mean("show_mean", true), stat("stat") { changeDefault(follows.flags, FOLLOWS_TOP | FOLLOWS_LEFT); |