Second Life viewer sources 1.19.0.0

1 files changed, 2 insertions, 6 deletions

diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp
index 016ab9e..cf1c749 100644
--- a/linden/indra/newview/llpanelaudioprefs.cpp
+++ b/linden/indra/newview/llpanelaudioprefs.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -97,8 +97,6 @@ BOOL LLPanelAudioPrefs::postBuild()
         mPreviousDistance = gSavedSettings.getF32("AudioLevelDistance");
         mPreviousRolloff = gSavedSettings.getF32("AudioLevelRolloff");
 
-        mPreviousBitrate = gSavedSettings.getS32("AudioDefaultBitrate");
-
         mPreviousMoneyThreshold = gSavedSettings.getF32("UISndMoneyChangeThreshold");
         mPreviousHealthThreshold = gSavedSettings.getF32("UISndHealthReductionThreshold");
 
@@ -114,8 +112,6 @@ BOOL LLPanelAudioPrefs::postBuild()
 
 void LLPanelAudioPrefs::cancel()
 {
-        
-        gSavedSettings.setS32("AudioDefaultBitrate", mPreviousBitrate);
         gSavedSettings.setF32("AudioLevelMaster", mPreviousVolume );
         gSavedSettings.setF32("AudioLevelUI", mPreviousUI );
         gSavedSettings.setF32("AudioLevelSFX", mPreviousSFX );