diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 18:24:07 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 18:24:07 -0800 |
| commit | 9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (patch) | |
| tree | 9c0df85bb3a8b5c4e58655179e1b29ee31594cfc /indra/newview/llstatusbar.cpp | |
| parent | 5ed6e0720af1b6cdf1a983e2c040eeb5d8ae33ba (diff) | |
| parent | db4e46e93d06c03520cb7c781b8e41b6d374414d (diff) | |
automated merge from trunk
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 8a36475510..bff32af228 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -354,7 +354,7 @@ void LLStatusBar::refresh() childSetEnabled("stat_btn", net_stats_visible); // update the master volume button state - BOOL mute_audio = gSavedSettings.getBOOL("MuteAudio"); + bool mute_audio = LLAppViewer::instance()->getMasterSystemAudioMute(); mBtnVolume->setToggleState(mute_audio); } @@ -523,8 +523,8 @@ void LLStatusBar::onMouseEnterVolume(LLUICtrl* ctrl) static void onClickVolume(void* data) { // toggle the master mute setting - BOOL mute_audio = gSavedSettings.getBOOL("MuteAudio"); - gSavedSettings.setBOOL("MuteAudio", !mute_audio); + bool mute_audio = LLAppViewer::instance()->getMasterSystemAudioMute(); + LLAppViewer::instance()->setMasterSystemAudioMute(!mute_audio); } // sets the static variables necessary for the date |