diff options
Diffstat (limited to 'linden/indra/newview/llpanelaudioprefs.cpp')
-rw-r--r-- | linden/indra/newview/llpanelaudioprefs.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp index 69f39fa..86ece1d 100644 --- a/linden/indra/newview/llpanelaudioprefs.cpp +++ b/linden/indra/newview/llpanelaudioprefs.cpp | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -86,6 +87,12 @@ LLPanelAudioPrefs::~LLPanelAudioPrefs() | |||
86 | 87 | ||
87 | BOOL LLPanelAudioPrefs::postBuild() | 88 | BOOL LLPanelAudioPrefs::postBuild() |
88 | { | 89 | { |
90 | refreshValues(); // initialize member data from saved settings | ||
91 | return TRUE; | ||
92 | } | ||
93 | |||
94 | void LLPanelAudioPrefs::refreshValues() | ||
95 | { | ||
89 | mPreviousVolume = gSavedSettings.getF32("AudioLevelMaster"); | 96 | mPreviousVolume = gSavedSettings.getF32("AudioLevelMaster"); |
90 | mPreviousSFX = gSavedSettings.getF32("AudioLevelSFX"); | 97 | mPreviousSFX = gSavedSettings.getF32("AudioLevelSFX"); |
91 | mPreviousUI = gSavedSettings.getF32("AudioLevelUI"); | 98 | mPreviousUI = gSavedSettings.getF32("AudioLevelUI"); |
@@ -104,9 +111,6 @@ BOOL LLPanelAudioPrefs::postBuild() | |||
104 | 111 | ||
105 | mPreviousMuteAudio = gSavedSettings.getBOOL("MuteAudio"); | 112 | mPreviousMuteAudio = gSavedSettings.getBOOL("MuteAudio"); |
106 | mPreviousMuteWhenMinimized = gSavedSettings.getBOOL("MuteWhenMinimized"); | 113 | mPreviousMuteWhenMinimized = gSavedSettings.getBOOL("MuteWhenMinimized"); |
107 | |||
108 | return TRUE; | ||
109 | |||
110 | } | 114 | } |
111 | 115 | ||
112 | void LLPanelAudioPrefs::cancel() | 116 | void LLPanelAudioPrefs::cancel() |