From db9616811d45e168d81c8e464fb8a9cf27e51172 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 26 Aug 2010 11:04:43 -0700 Subject: Ported gSavedSettings changes from Emerald (as well as modifying a few of ours) --- linden/indra/newview/llvieweraudio.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'linden/indra/newview/llvieweraudio.cpp') diff --git a/linden/indra/newview/llvieweraudio.cpp b/linden/indra/newview/llvieweraudio.cpp index f043fb5..672836d 100644 --- a/linden/indra/newview/llvieweraudio.cpp +++ b/linden/indra/newview/llvieweraudio.cpp @@ -114,10 +114,14 @@ void init_audio() void audio_update_volume(bool force_update) { - F32 master_volume = gSavedSettings.getF32("AudioLevelMaster"); - bool wind_muted = gSavedSettings.getBOOL("MuteWind"); - bool mute_audio = gSavedSettings.getBOOL("MuteAudio"); + static BOOL* sMuteAudio = rebind_llcontrol("MuteAudio", &gSavedSettings, true); + static BOOL* sMuteWind = rebind_llcontrol("MuteWind", &gSavedSettings, true); + static F32 *sAudioLevelMaster = rebind_llcontrol("AudioLevelMaster", &gSavedSettings, true); + + F32 master_volume = (*sAudioLevelMaster); + bool wind_muted = (*sMuteWind); + BOOL mute_audio = (*sMuteAudio); if (!gViewerWindow->getActive() && (gSavedSettings.getBOOL("MuteWhenMinimized"))) { mute_audio = TRUE; -- cgit v1.1