diff options
author | McCabe Maxsted | 2010-08-26 11:04:43 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-09-25 08:35:35 -0700 |
commit | db9616811d45e168d81c8e464fb8a9cf27e51172 (patch) | |
tree | a8539baeb46297d51072285d946f925a8544eb64 /linden/indra/newview/llvieweraudio.cpp | |
parent | Revert "Updated boost 1.36 libs for Windows to support local textures (todo: ... (diff) | |
download | meta-impy-db9616811d45e168d81c8e464fb8a9cf27e51172.zip meta-impy-db9616811d45e168d81c8e464fb8a9cf27e51172.tar.gz meta-impy-db9616811d45e168d81c8e464fb8a9cf27e51172.tar.bz2 meta-impy-db9616811d45e168d81c8e464fb8a9cf27e51172.tar.xz |
Ported gSavedSettings changes from Emerald (as well as modifying a few of ours)
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llvieweraudio.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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() | |||
114 | 114 | ||
115 | void audio_update_volume(bool force_update) | 115 | void audio_update_volume(bool force_update) |
116 | { | 116 | { |
117 | F32 master_volume = gSavedSettings.getF32("AudioLevelMaster"); | ||
118 | bool wind_muted = gSavedSettings.getBOOL("MuteWind"); | ||
119 | bool mute_audio = gSavedSettings.getBOOL("MuteAudio"); | ||
120 | 117 | ||
118 | static BOOL* sMuteAudio = rebind_llcontrol<BOOL>("MuteAudio", &gSavedSettings, true); | ||
119 | static BOOL* sMuteWind = rebind_llcontrol<BOOL>("MuteWind", &gSavedSettings, true); | ||
120 | static F32 *sAudioLevelMaster = rebind_llcontrol<F32>("AudioLevelMaster", &gSavedSettings, true); | ||
121 | |||
122 | F32 master_volume = (*sAudioLevelMaster); | ||
123 | bool wind_muted = (*sMuteWind); | ||
124 | BOOL mute_audio = (*sMuteAudio); | ||
121 | if (!gViewerWindow->getActive() && (gSavedSettings.getBOOL("MuteWhenMinimized"))) | 125 | if (!gViewerWindow->getActive() && (gSavedSettings.getBOOL("MuteWhenMinimized"))) |
122 | { | 126 | { |
123 | mute_audio = TRUE; | 127 | mute_audio = TRUE; |