diff options
| author | Aleric Inglewood | 2010-10-02 15:14:37 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-10-02 15:14:37 +0200 |
| commit | 823a01a4d8c8c1f909a54c05f45787e5bbba1c6a (patch) | |
| tree | daba9dd3e245b915cf2e73c9435d04c927840df1 /linden/indra/newview/llpanelaudiovolume.cpp | |
| parent | RED-581: SNOW-796: Clicking 'Reset to default' in the Debug Settings floater ... (diff) | |
| parent | Changed version to Experimental 2010.10.02 (diff) | |
| download | meta-impy-823a01a4d8c8c1f909a54c05f45787e5bbba1c6a.zip meta-impy-823a01a4d8c8c1f909a54c05f45787e5bbba1c6a.tar.gz meta-impy-823a01a4d8c8c1f909a54c05f45787e5bbba1c6a.tar.bz2 meta-impy-823a01a4d8c8c1f909a54c05f45787e5bbba1c6a.tar.xz | |
Merge branch 'weekly' of http://github.com/imprudence/imprudence into weekly
Diffstat (limited to 'linden/indra/newview/llpanelaudiovolume.cpp')
| -rw-r--r-- | linden/indra/newview/llpanelaudiovolume.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanelaudiovolume.cpp b/linden/indra/newview/llpanelaudiovolume.cpp index 5045e8f..bb10f80 100644 --- a/linden/indra/newview/llpanelaudiovolume.cpp +++ b/linden/indra/newview/llpanelaudiovolume.cpp | |||
| @@ -67,8 +67,9 @@ LLPanelAudioVolume::~LLPanelAudioVolume () | |||
| 67 | // | 67 | // |
| 68 | void LLPanelAudioVolume::draw() | 68 | void LLPanelAudioVolume::draw() |
| 69 | { | 69 | { |
| 70 | BOOL mute = gSavedSettings.getBOOL("MuteAudio"); | 70 | |
| 71 | bool enable = mute ? false : true; | 71 | static BOOL* sMuteAudio = rebind_llcontrol<BOOL>("MuteAudio", &gSavedSettings, true); |
| 72 | bool enable = (*sMuteAudio) ? false : true; | ||
| 72 | childSetEnabled("Music Volume", enable); | 73 | childSetEnabled("Music Volume", enable); |
| 73 | childSetEnabled("Media Volume", enable); | 74 | childSetEnabled("Media Volume", enable); |
| 74 | childSetEnabled("Voice Volume", enable); | 75 | childSetEnabled("Voice Volume", enable); |