diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-27 14:08:04 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-27 14:08:04 -0800 |
| commit | dbb2dadb68f5ed4349626bb91dcfcce76d901124 (patch) | |
| tree | a6281467b5038fdfa878772894f9fdecb26188bd /indra/newview/llstatusbar.cpp | |
| parent | 4421a51cfeb43b3be6de520acb9f94052fc7e2df (diff) | |
| parent | d3f361752e5988800228cff11fcc50289b2f88c7 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
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 |