diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 10:54:45 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 10:54:45 -0800 |
| commit | ec30e6e70ff71723e2137595bc6ecd3eb358aabe (patch) | |
| tree | 49055571f280685a440b1d79415a8004b5f28c7e /indra/newview/llstatusbar.cpp | |
| parent | 6114ce2d27a3c776a59d1f09ad05d9b2f100a35d (diff) | |
| parent | dbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff) | |
Merge from viewer-development
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 75db269bde..89240c982f 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -114,6 +114,7 @@ LLStatusBar::LLStatusBar(const LLRect& rect) mTextTime(NULL), mSGBandwidth(NULL), mSGPacketLoss(NULL), + mBtnStats(NULL), mBtnVolume(NULL), mBoxBalance(NULL), mBalance(0), @@ -173,6 +174,8 @@ BOOL LLStatusBar::postBuild() mBoxBalance = getChild<LLTextBox>("balance"); mBoxBalance->setClickedCallback( &LLStatusBar::onClickBalance, this ); + + mBtnStats = getChildView("stat_btn"); mBtnVolume = getChild<LLButton>( "volume_btn" ); mBtnVolume->setClickedCallback( onClickVolume, this ); @@ -288,7 +291,7 @@ void LLStatusBar::refresh() mSGBandwidth->setVisible(net_stats_visible); mSGPacketLoss->setVisible(net_stats_visible); - getChildView("stat_btn")->setEnabled(net_stats_visible); + mBtnStats->setEnabled(net_stats_visible); // update the master volume button state bool mute_audio = LLAppViewer::instance()->getMasterSystemAudioMute(); |