Renamed LLPanelAudioPrefsLLPanel to LLPrefsMedia, inspired by Henri Beauchamp (Cool VL)

Tue, 27 Dec 2011 12:40:48 +0100

author
Ansariel
date
Tue, 27 Dec 2011 12:40:48 +0100
changeset 1615
2388998e3bb6
parent 1614
b6ad16cb1945
child 1616
d5a1e93aefb9

Renamed LLPanelAudioPrefsLLPanel to LLPrefsMedia, inspired by Henri Beauchamp (Cool VL)

indra/newview/CMakeLists.txt file | annotate | diff | revisions
indra/newview/llfloaterpreference.cpp file | annotate | diff | revisions
indra/newview/llfloaterpreference.h file | annotate | diff | revisions
indra/newview/llpanelaudioprefs.cpp file | annotate | diff | revisions
indra/newview/llpanelaudioprefs.h file | annotate | diff | revisions
indra/newview/llprefsmedia.cpp file | annotate | diff | revisions
indra/newview/llprefsmedia.h file | annotate | diff | revisions
indra/newview/skins/default/xui/da/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/da/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/de/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/de/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en-us/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/es/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/es/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/fr/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/fr/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/hu/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/hu/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/it/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/it/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ja/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ja/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ko/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ko/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/nl/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/nl/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/pl/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/pl/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/pt/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/pt/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ru/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ru/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/tr/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/tr/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/uk/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/uk/panel_preferences_media.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/zh/panel_preferences_audio.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/zh/panel_preferences_media.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/CMakeLists.txt	Tue Dec 27 12:39:25 2011 +0100
     1.2 +++ b/indra/newview/CMakeLists.txt	Tue Dec 27 12:40:48 2011 +0100
     1.3 @@ -330,7 +330,6 @@
     1.4      llnetmap.cpp
     1.5      llnotify.cpp
     1.6      lloverlaybar.cpp
     1.7 -    llpanelaudioprefs.cpp
     1.8      llpanelaudiovolume.cpp
     1.9      llpanelavatar.cpp
    1.10      llpanelclassified.cpp
    1.11 @@ -384,6 +383,7 @@
    1.12      llpolymorph.cpp
    1.13      llprefschat.cpp
    1.14      llprefsim.cpp
    1.15 +    llprefsmedia.cpp
    1.16      llprefsvoice.cpp
    1.17      llpreviewanim.cpp
    1.18      llpreview.cpp
    1.19 @@ -809,7 +809,6 @@
    1.20      llnetmap.h
    1.21      llnotify.h
    1.22      lloverlaybar.h
    1.23 -    llpanelaudioprefs.h
    1.24      llpanelaudiovolume.h
    1.25      llpanelavatar.h
    1.26      llpanelclassified.h
    1.27 @@ -864,6 +863,7 @@
    1.28      llpolymorph.h
    1.29      llprefschat.h
    1.30      llprefsim.h
    1.31 +    llprefsmedia.h
    1.32      llprefsvoice.h
    1.33      llpreview.h
    1.34      llpreviewanim.h
     2.1 --- a/indra/newview/llfloaterpreference.cpp	Tue Dec 27 12:39:25 2011 +0100
     2.2 +++ b/indra/newview/llfloaterpreference.cpp	Tue Dec 27 12:40:48 2011 +0100
     2.3 @@ -52,7 +52,6 @@
     2.4  #include "llfloaterabout.h"
     2.5  #include "llfloaterpreference.h"
     2.6  #include "llpanelnetwork.h"
     2.7 -#include "llpanelaudioprefs.h"
     2.8  #include "llpaneldisplay.h"
     2.9  #include "llpaneldebug.h"
    2.10  #include "llpanelgeneral.h"
    2.11 @@ -66,6 +65,7 @@
    2.12  #include "llprefschat.h"
    2.13  #include "llprefsvoice.h"
    2.14  #include "llprefsim.h"
    2.15 +#include "llprefsmedia.h"
    2.16  #include "llresizehandle.h"
    2.17  #include "llresmgr.h"
    2.18  #include "llassetstorage.h"
    2.19 @@ -158,7 +158,7 @@
    2.20  	mTabContainer->addTabPanel(mDisplayPanel, mDisplayPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
    2.21  	mDisplayPanel->setDefaultBtn(default_btn);
    2.22  
    2.23 -	mAudioPanel = new LLPanelAudioPrefs();
    2.24 +	mAudioPanel = new LLPrefsMedia();
    2.25  	mTabContainer->addTabPanel(mAudioPanel, mAudioPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
    2.26  	mAudioPanel->setDefaultBtn(default_btn);
    2.27  
     3.1 --- a/indra/newview/llfloaterpreference.h	Tue Dec 27 12:39:25 2011 +0100
     3.2 +++ b/indra/newview/llfloaterpreference.h	Tue Dec 27 12:40:48 2011 +0100
     3.3 @@ -47,7 +47,6 @@
     3.4  class LLPanelInput;
     3.5  class LLPanelLCD;
     3.6  class LLPanelDisplay;
     3.7 -class LLPanelAudioPrefs;
     3.8  class LLPanelDebug;
     3.9  class LLPanelNetwork;
    3.10  class LLPanelWeb;
    3.11 @@ -56,6 +55,7 @@
    3.12  class LLPrefsChat;
    3.13  class LLPrefsVoice;
    3.14  class LLPrefsIM;
    3.15 +class LLPrefsMedia;
    3.16  class LLPanelMsgs;
    3.17  class LLPanelSkins;
    3.18  class LLScrollListCtrl;
    3.19 @@ -93,11 +93,11 @@
    3.20  	LLPanelInput			*mInputPanel;
    3.21  	LLPanelNetwork	        *mNetworkPanel;
    3.22  	LLPanelDisplay	        *mDisplayPanel;
    3.23 -	LLPanelAudioPrefs		*mAudioPanel;
    3.24  //	LLPanelDebug			*mDebugPanel;
    3.25  	LLPrefsChat				*mPrefsChat;
    3.26  	LLPrefsVoice			*mPrefsVoice;
    3.27  	LLPrefsIM				*mPrefsIM;
    3.28 +	LLPrefsMedia			*mAudioPanel;
    3.29  	LLPanelWeb				*mWebPanel;
    3.30  	LLPanelMsgs				*mMsgPanel;
    3.31  	LLPanelLCD				*mLCDPanel;
     4.1 --- a/indra/newview/llpanelaudioprefs.cpp	Tue Dec 27 12:39:25 2011 +0100
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,143 +0,0 @@
     4.4 -/** 
     4.5 - * @file llpanelaudioprefs.cpp
     4.6 - * @brief Audio preference implementation
     4.7 - *
     4.8 - * $LicenseInfo:firstyear=2001&license=viewergpl$
     4.9 - * 
    4.10 - * Copyright (c) 2001-2009, Linden Research, Inc.
    4.11 - * 
    4.12 - * Second Life Viewer Source Code
    4.13 - * The source code in this file ("Source Code") is provided by Linden Lab
    4.14 - * to you under the terms of the GNU General Public License, version 2.0
    4.15 - * ("GPL"), unless you have obtained a separate licensing agreement
    4.16 - * ("Other License"), formally executed by you and Linden Lab.  Terms of
    4.17 - * the GPL can be found in doc/GPL-license.txt in this distribution, or
    4.18 - * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
    4.19 - * 
    4.20 - * There are special exceptions to the terms and conditions of the GPL as
    4.21 - * it is applied to this Source Code. View the full text of the exception
    4.22 - * in the file doc/FLOSS-exception.txt in this software distribution, or
    4.23 - * online at
    4.24 - * http://secondlifegrid.net/programs/open_source/licensing/flossexception
    4.25 - * 
    4.26 - * By copying, modifying or distributing this software, you acknowledge
    4.27 - * that you have read and understood your obligations described above,
    4.28 - * and agree to abide by those obligations.
    4.29 - * 
    4.30 - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
    4.31 - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
    4.32 - * COMPLETENESS OR PERFORMANCE.
    4.33 - * $/LicenseInfo$
    4.34 - */
    4.35 -
    4.36 -#include "llviewerprecompiledheaders.h"
    4.37 -
    4.38 -// file include
    4.39 -#include "llpanelaudioprefs.h"
    4.40 -
    4.41 -// linden library includes
    4.42 -#include "llerror.h"
    4.43 -#include "llrect.h"
    4.44 -#include "llstring.h"
    4.45 -#include "llfontgl.h"
    4.46 -
    4.47 -// project includes
    4.48 -#include "llaudioengine.h"
    4.49 -#include "llbutton.h"
    4.50 -#include "llcheckboxctrl.h"
    4.51 -#include "llcombobox.h"
    4.52 -#include "llfirstuse.h"
    4.53 -#include "llnotify.h"
    4.54 -#include "llpanelaudiovolume.h"
    4.55 -#include "llparcel.h"
    4.56 -#include "llradiogroup.h"
    4.57 -#include "llresmgr.h"
    4.58 -#include "llslider.h"
    4.59 -#include "llsliderctrl.h"
    4.60 -#include "llspinctrl.h"
    4.61 -#include "lltextbox.h"
    4.62 -#include "llui.h"
    4.63 -#include "llviewerparcelmgr.h"
    4.64 -#include "lluictrlfactory.h"
    4.65 -#include "llviewerwindow.h"
    4.66 -#include "llviewercontrol.h"
    4.67 -#include "llstartup.h"
    4.68 -#include "floatermedialists.h"
    4.69 -
    4.70 -//
    4.71 -// Static functions
    4.72 -//
    4.73 -
    4.74 -//static
    4.75 -void* LLPanelAudioPrefs::createVolumePanel(void* data)
    4.76 -{
    4.77 -	LLPanelAudioVolume* panel = new LLPanelAudioVolume();
    4.78 -	return panel;
    4.79 -}
    4.80 -
    4.81 -LLPanelAudioPrefs::LLPanelAudioPrefs()
    4.82 -{
    4.83 -	mFactoryMap["Volume Panel"]	= LLCallbackMap(createVolumePanel, NULL);
    4.84 -	
    4.85 -	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_audio.xml", &getFactoryMap());
    4.86 -}
    4.87 -
    4.88 -LLPanelAudioPrefs::~LLPanelAudioPrefs()
    4.89 -{
    4.90 -	// Children all cleaned up by default view destructor.
    4.91 -}
    4.92 -
    4.93 -BOOL LLPanelAudioPrefs::postBuild()
    4.94 -{
    4.95 -	
    4.96 -	getChild<LLButton>("open_media_lists")->setClickedCallback(FloaterMediaLists::show, NULL);
    4.97 -	if(LLStartUp::getStartupState() >= STATE_INVENTORY_SEND)childSetEnabled("open_media_lists",true);
    4.98 -	
    4.99 -	refreshValues(); // initialize member data from saved settings
   4.100 -	return TRUE;
   4.101 -}
   4.102 -
   4.103 -void LLPanelAudioPrefs::refreshValues()
   4.104 -{
   4.105 -	mPreviousVolume = gSavedSettings.getF32("AudioLevelMaster");
   4.106 -	mPreviousSFX = gSavedSettings.getF32("AudioLevelSFX");
   4.107 -	mPreviousUI = gSavedSettings.getF32("AudioLevelUI");
   4.108 -	mPreviousEnvironment = gSavedSettings.getF32("AudioLevelAmbient");
   4.109 -	mPreviousMusicVolume = gSavedSettings.getF32("AudioLevelMusic");
   4.110 -	mPreviousMediaVolume = gSavedSettings.getF32("AudioLevelMedia");
   4.111 -	mPreviousDoppler = gSavedSettings.getF32("AudioLevelDoppler");
   4.112 -	mPreviousRolloff = gSavedSettings.getF32("AudioLevelRolloff");
   4.113 -
   4.114 -	mPreviousMoneyThreshold = gSavedSettings.getF32("UISndMoneyChangeThreshold");
   4.115 -	mPreviousHealthThreshold = gSavedSettings.getF32("UISndHealthReductionThreshold");
   4.116 -
   4.117 -	mPreviousStreamingMusic = gSavedSettings.getBOOL("AudioStreamingMusic");
   4.118 -	mPreviousStreamingVideo = gSavedSettings.getBOOL("AudioStreamingVideo");
   4.119 -	mPreviousMediaFilter = gSavedSettings.getBOOL("MediaEnableFilter");
   4.120 -	
   4.121 -	mPreviousMuteAudio = gSavedSettings.getBOOL("MuteAudio");
   4.122 -	mPreviousMuteWhenMinimized = gSavedSettings.getBOOL("MuteWhenMinimized");
   4.123 -}
   4.124 -
   4.125 -void LLPanelAudioPrefs::cancel()
   4.126 -{
   4.127 -	gSavedSettings.setF32("AudioLevelMaster", mPreviousVolume );
   4.128 -	gSavedSettings.setF32("AudioLevelUI", mPreviousUI );
   4.129 -	gSavedSettings.setF32("AudioLevelSFX", mPreviousSFX );
   4.130 -	gSavedSettings.setF32("AudioLevelAmbient", mPreviousEnvironment );
   4.131 -	gSavedSettings.setF32("AudioLevelMusic", mPreviousMusicVolume);
   4.132 -	gSavedSettings.setF32("AudioLevelMedia", mPreviousMediaVolume);
   4.133 -	gSavedSettings.setF32("AudioLevelDoppler", mPreviousDoppler );
   4.134 -	gSavedSettings.setF32("AudioLevelRolloff", mPreviousRolloff );
   4.135 -
   4.136 -	gSavedSettings.setF32("UISndMoneyChangeThreshold", mPreviousMoneyThreshold );
   4.137 -	gSavedSettings.setF32("UISndHealthReductionThreshold", mPreviousHealthThreshold );
   4.138 -
   4.139 -	gSavedSettings.setBOOL("AudioStreamingMusic", mPreviousStreamingMusic );
   4.140 -	gSavedSettings.setBOOL("AudioStreamingVideo", mPreviousStreamingVideo );
   4.141 -	gSavedSettings.setBOOL("MediaEnableFilter", mPreviousMediaFilter);
   4.142 -
   4.143 -	
   4.144 -	gSavedSettings.setBOOL("MuteAudio", mPreviousMuteAudio );
   4.145 -	gSavedSettings.setBOOL("MuteWhenMinimized", mPreviousMuteWhenMinimized );
   4.146 -}
     5.1 --- a/indra/newview/llpanelaudioprefs.h	Tue Dec 27 12:39:25 2011 +0100
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,83 +0,0 @@
     5.4 -/** 
     5.5 - * @file llpanelaudioprefs.h
     5.6 - * @brief Audio preference definitions
     5.7 - *
     5.8 - * $LicenseInfo:firstyear=2001&license=viewergpl$
     5.9 - * 
    5.10 - * Copyright (c) 2001-2009, Linden Research, Inc.
    5.11 - * 
    5.12 - * Second Life Viewer Source Code
    5.13 - * The source code in this file ("Source Code") is provided by Linden Lab
    5.14 - * to you under the terms of the GNU General Public License, version 2.0
    5.15 - * ("GPL"), unless you have obtained a separate licensing agreement
    5.16 - * ("Other License"), formally executed by you and Linden Lab.  Terms of
    5.17 - * the GPL can be found in doc/GPL-license.txt in this distribution, or
    5.18 - * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
    5.19 - * 
    5.20 - * There are special exceptions to the terms and conditions of the GPL as
    5.21 - * it is applied to this Source Code. View the full text of the exception
    5.22 - * in the file doc/FLOSS-exception.txt in this software distribution, or
    5.23 - * online at
    5.24 - * http://secondlifegrid.net/programs/open_source/licensing/flossexception
    5.25 - * 
    5.26 - * By copying, modifying or distributing this software, you acknowledge
    5.27 - * that you have read and understood your obligations described above,
    5.28 - * and agree to abide by those obligations.
    5.29 - * 
    5.30 - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
    5.31 - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
    5.32 - * COMPLETENESS OR PERFORMANCE.
    5.33 - * $/LicenseInfo$
    5.34 - */
    5.35 -
    5.36 -#ifndef LL_LLPANELAUDIOPREFS_H
    5.37 -#define LL_LLPANELAUDIOPREFS_H
    5.38 -
    5.39 -#include "llpanel.h"
    5.40 -
    5.41 -class LLSpinCtrl;
    5.42 -class LLSlider;
    5.43 -class LLSliderCtrl;
    5.44 -class LLCheckBoxCtrl;
    5.45 -class LLTextBox;
    5.46 -class LLRadioGroup;
    5.47 -
    5.48 -class LLPanelAudioPrefs : public LLPanel
    5.49 -{
    5.50 -public:
    5.51 -	LLPanelAudioPrefs();
    5.52 -	virtual ~LLPanelAudioPrefs();
    5.53 -	
    5.54 -	void apply() { refreshValues(); }
    5.55 -	void cancel();	// Cancel the changed values.
    5.56 -
    5.57 -	virtual BOOL postBuild();
    5.58 -
    5.59 -	static void* createVolumePanel(void* data);
    5.60 -	
    5.61 -private:
    5.62 -	void refreshValues();
    5.63 -
    5.64 -	F32             mPreviousVolume;
    5.65 -	F32             mPreviousMusicVolume;
    5.66 -	F32             mPreviousMediaVolume;
    5.67 -	F32             mPreviousSFX;
    5.68 -	F32             mPreviousUI;
    5.69 -	F32             mPreviousEnvironment;
    5.70 -	F32             mPreviousDoppler;
    5.71 -	F32             mPreviousDistance;
    5.72 -	F32             mPreviousRolloff;
    5.73 -
    5.74 -	S32             mPreviousBitrate;
    5.75 -
    5.76 -	F32             mPreviousMoneyThreshold;
    5.77 -	F32             mPreviousHealthThreshold;
    5.78 -
    5.79 -	BOOL			mPreviousStreamingMusic;
    5.80 -	BOOL			mPreviousStreamingVideo;
    5.81 -	BOOL            mPreviousMuteAudio;
    5.82 -	BOOL            mPreviousMuteWhenMinimized;
    5.83 -	BOOL			mPreviousMediaFilter;
    5.84 -};
    5.85 -
    5.86 -#endif
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/indra/newview/llprefsmedia.cpp	Tue Dec 27 12:40:48 2011 +0100
     6.3 @@ -0,0 +1,143 @@
     6.4 +/** 
     6.5 + * @file llprefsmedia.cpp
     6.6 + * @brief Media preference implementation
     6.7 + *
     6.8 + * $LicenseInfo:firstyear=2001&license=viewergpl$
     6.9 + * 
    6.10 + * Copyright (c) 2001-2009, Linden Research, Inc.
    6.11 + * 
    6.12 + * Second Life Viewer Source Code
    6.13 + * The source code in this file ("Source Code") is provided by Linden Lab
    6.14 + * to you under the terms of the GNU General Public License, version 2.0
    6.15 + * ("GPL"), unless you have obtained a separate licensing agreement
    6.16 + * ("Other License"), formally executed by you and Linden Lab.  Terms of
    6.17 + * the GPL can be found in doc/GPL-license.txt in this distribution, or
    6.18 + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
    6.19 + * 
    6.20 + * There are special exceptions to the terms and conditions of the GPL as
    6.21 + * it is applied to this Source Code. View the full text of the exception
    6.22 + * in the file doc/FLOSS-exception.txt in this software distribution, or
    6.23 + * online at
    6.24 + * http://secondlifegrid.net/programs/open_source/licensing/flossexception
    6.25 + * 
    6.26 + * By copying, modifying or distributing this software, you acknowledge
    6.27 + * that you have read and understood your obligations described above,
    6.28 + * and agree to abide by those obligations.
    6.29 + * 
    6.30 + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
    6.31 + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
    6.32 + * COMPLETENESS OR PERFORMANCE.
    6.33 + * $/LicenseInfo$
    6.34 + */
    6.35 +
    6.36 +#include "llviewerprecompiledheaders.h"
    6.37 +
    6.38 +// file include
    6.39 +#include "llprefsmedia.h"
    6.40 +
    6.41 +// linden library includes
    6.42 +#include "llerror.h"
    6.43 +#include "llrect.h"
    6.44 +#include "llstring.h"
    6.45 +#include "llfontgl.h"
    6.46 +
    6.47 +// project includes
    6.48 +#include "llaudioengine.h"
    6.49 +#include "llbutton.h"
    6.50 +#include "llcheckboxctrl.h"
    6.51 +#include "llcombobox.h"
    6.52 +#include "llfirstuse.h"
    6.53 +#include "llnotify.h"
    6.54 +#include "llpanelaudiovolume.h"
    6.55 +#include "llparcel.h"
    6.56 +#include "llradiogroup.h"
    6.57 +#include "llresmgr.h"
    6.58 +#include "llslider.h"
    6.59 +#include "llsliderctrl.h"
    6.60 +#include "llspinctrl.h"
    6.61 +#include "lltextbox.h"
    6.62 +#include "llui.h"
    6.63 +#include "llviewerparcelmgr.h"
    6.64 +#include "lluictrlfactory.h"
    6.65 +#include "llviewerwindow.h"
    6.66 +#include "llviewercontrol.h"
    6.67 +#include "llstartup.h"
    6.68 +#include "floatermedialists.h"
    6.69 +
    6.70 +//
    6.71 +// Static functions
    6.72 +//
    6.73 +
    6.74 +//static
    6.75 +void* LLPrefsMedia::createVolumePanel(void* data)
    6.76 +{
    6.77 +	LLPanelAudioVolume* panel = new LLPanelAudioVolume();
    6.78 +	return panel;
    6.79 +}
    6.80 +
    6.81 +LLPrefsMedia::LLPrefsMedia()
    6.82 +{
    6.83 +	mFactoryMap["Volume Panel"]	= LLCallbackMap(createVolumePanel, NULL);
    6.84 +	
    6.85 +	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_media.xml", &getFactoryMap());
    6.86 +}
    6.87 +
    6.88 +LLPrefsMedia::~LLPrefsMedia()
    6.89 +{
    6.90 +	// Children all cleaned up by default view destructor.
    6.91 +}
    6.92 +
    6.93 +BOOL LLPrefsMedia::postBuild()
    6.94 +{
    6.95 +	
    6.96 +	getChild<LLButton>("open_media_lists")->setClickedCallback(FloaterMediaLists::show, NULL);
    6.97 +	if(LLStartUp::getStartupState() >= STATE_INVENTORY_SEND)childSetEnabled("open_media_lists",true);
    6.98 +	
    6.99 +	refreshValues(); // initialize member data from saved settings
   6.100 +	return TRUE;
   6.101 +}
   6.102 +
   6.103 +void LLPrefsMedia::refreshValues()
   6.104 +{
   6.105 +	mPreviousVolume = gSavedSettings.getF32("AudioLevelMaster");
   6.106 +	mPreviousSFX = gSavedSettings.getF32("AudioLevelSFX");
   6.107 +	mPreviousUI = gSavedSettings.getF32("AudioLevelUI");
   6.108 +	mPreviousEnvironment = gSavedSettings.getF32("AudioLevelAmbient");
   6.109 +	mPreviousMusicVolume = gSavedSettings.getF32("AudioLevelMusic");
   6.110 +	mPreviousMediaVolume = gSavedSettings.getF32("AudioLevelMedia");
   6.111 +	mPreviousDoppler = gSavedSettings.getF32("AudioLevelDoppler");
   6.112 +	mPreviousRolloff = gSavedSettings.getF32("AudioLevelRolloff");
   6.113 +
   6.114 +	mPreviousMoneyThreshold = gSavedSettings.getF32("UISndMoneyChangeThreshold");
   6.115 +	mPreviousHealthThreshold = gSavedSettings.getF32("UISndHealthReductionThreshold");
   6.116 +
   6.117 +	mPreviousStreamingMusic = gSavedSettings.getBOOL("AudioStreamingMusic");
   6.118 +	mPreviousStreamingVideo = gSavedSettings.getBOOL("AudioStreamingVideo");
   6.119 +	mPreviousMediaFilter = gSavedSettings.getBOOL("MediaEnableFilter");
   6.120 +	
   6.121 +	mPreviousMuteAudio = gSavedSettings.getBOOL("MuteAudio");
   6.122 +	mPreviousMuteWhenMinimized = gSavedSettings.getBOOL("MuteWhenMinimized");
   6.123 +}
   6.124 +
   6.125 +void LLPrefsMedia::cancel()
   6.126 +{
   6.127 +	gSavedSettings.setF32("AudioLevelMaster", mPreviousVolume );
   6.128 +	gSavedSettings.setF32("AudioLevelUI", mPreviousUI );
   6.129 +	gSavedSettings.setF32("AudioLevelSFX", mPreviousSFX );
   6.130 +	gSavedSettings.setF32("AudioLevelAmbient", mPreviousEnvironment );
   6.131 +	gSavedSettings.setF32("AudioLevelMusic", mPreviousMusicVolume);
   6.132 +	gSavedSettings.setF32("AudioLevelMedia", mPreviousMediaVolume);
   6.133 +	gSavedSettings.setF32("AudioLevelDoppler", mPreviousDoppler );
   6.134 +	gSavedSettings.setF32("AudioLevelRolloff", mPreviousRolloff );
   6.135 +
   6.136 +	gSavedSettings.setF32("UISndMoneyChangeThreshold", mPreviousMoneyThreshold );
   6.137 +	gSavedSettings.setF32("UISndHealthReductionThreshold", mPreviousHealthThreshold );
   6.138 +
   6.139 +	gSavedSettings.setBOOL("AudioStreamingMusic", mPreviousStreamingMusic );
   6.140 +	gSavedSettings.setBOOL("AudioStreamingVideo", mPreviousStreamingVideo );
   6.141 +	gSavedSettings.setBOOL("MediaEnableFilter", mPreviousMediaFilter);
   6.142 +
   6.143 +	
   6.144 +	gSavedSettings.setBOOL("MuteAudio", mPreviousMuteAudio );
   6.145 +	gSavedSettings.setBOOL("MuteWhenMinimized", mPreviousMuteWhenMinimized );
   6.146 +}
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/indra/newview/llprefsmedia.h	Tue Dec 27 12:40:48 2011 +0100
     7.3 @@ -0,0 +1,83 @@
     7.4 +/** 
     7.5 + * @file llprefsmedia.h
     7.6 + * @brief Media preference definitions
     7.7 + *
     7.8 + * $LicenseInfo:firstyear=2001&license=viewergpl$
     7.9 + * 
    7.10 + * Copyright (c) 2001-2009, Linden Research, Inc.
    7.11 + * 
    7.12 + * Second Life Viewer Source Code
    7.13 + * The source code in this file ("Source Code") is provided by Linden Lab
    7.14 + * to you under the terms of the GNU General Public License, version 2.0
    7.15 + * ("GPL"), unless you have obtained a separate licensing agreement
    7.16 + * ("Other License"), formally executed by you and Linden Lab.  Terms of
    7.17 + * the GPL can be found in doc/GPL-license.txt in this distribution, or
    7.18 + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
    7.19 + * 
    7.20 + * There are special exceptions to the terms and conditions of the GPL as
    7.21 + * it is applied to this Source Code. View the full text of the exception
    7.22 + * in the file doc/FLOSS-exception.txt in this software distribution, or
    7.23 + * online at
    7.24 + * http://secondlifegrid.net/programs/open_source/licensing/flossexception
    7.25 + * 
    7.26 + * By copying, modifying or distributing this software, you acknowledge
    7.27 + * that you have read and understood your obligations described above,
    7.28 + * and agree to abide by those obligations.
    7.29 + * 
    7.30 + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
    7.31 + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
    7.32 + * COMPLETENESS OR PERFORMANCE.
    7.33 + * $/LicenseInfo$
    7.34 + */
    7.35 +
    7.36 +#ifndef LL_LLPREFSMEDIA_H
    7.37 +#define LL_LLPREFSMEDIA_H
    7.38 +
    7.39 +#include "llpanel.h"
    7.40 +
    7.41 +class LLSpinCtrl;
    7.42 +class LLSlider;
    7.43 +class LLSliderCtrl;
    7.44 +class LLCheckBoxCtrl;
    7.45 +class LLTextBox;
    7.46 +class LLRadioGroup;
    7.47 +
    7.48 +class LLPrefsMedia : public LLPanel
    7.49 +{
    7.50 +public:
    7.51 +	LLPrefsMedia();
    7.52 +	virtual ~LLPrefsMedia();
    7.53 +	
    7.54 +	void apply() { refreshValues(); }
    7.55 +	void cancel();	// Cancel the changed values.
    7.56 +
    7.57 +	virtual BOOL postBuild();
    7.58 +
    7.59 +	static void* createVolumePanel(void* data);
    7.60 +	
    7.61 +private:
    7.62 +	void refreshValues();
    7.63 +
    7.64 +	F32             mPreviousVolume;
    7.65 +	F32             mPreviousMusicVolume;
    7.66 +	F32             mPreviousMediaVolume;
    7.67 +	F32             mPreviousSFX;
    7.68 +	F32             mPreviousUI;
    7.69 +	F32             mPreviousEnvironment;
    7.70 +	F32             mPreviousDoppler;
    7.71 +	F32             mPreviousDistance;
    7.72 +	F32             mPreviousRolloff;
    7.73 +
    7.74 +	S32             mPreviousBitrate;
    7.75 +
    7.76 +	F32             mPreviousMoneyThreshold;
    7.77 +	F32             mPreviousHealthThreshold;
    7.78 +
    7.79 +	BOOL			mPreviousStreamingMusic;
    7.80 +	BOOL			mPreviousStreamingVideo;
    7.81 +	BOOL            mPreviousMuteAudio;
    7.82 +	BOOL            mPreviousMuteWhenMinimized;
    7.83 +	BOOL			mPreviousMediaFilter;
    7.84 +};
    7.85 +
    7.86 +#endif
     8.1 --- a/indra/newview/skins/default/xui/da/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,24 +0,0 @@
     8.4 -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
     8.5 -<panel label="Lyd &amp; video" name="Media panel">
     8.6 -	<text type="string" length="1" name="muting_text">
     8.7 -		Lydstyrke:
     8.8 -	</text>
     8.9 -	<text type="string" length="1" name="streaming_prefs_text">
    8.10 -		Streaming indstillinger:
    8.11 -	</text>
    8.12 -	<text type="string" length="1" name="audio_prefs_text">
    8.13 -		Lyd indstillinger:
    8.14 -	</text>
    8.15 -	<panel label="Lydstyrke" name="Volume Panel" />
    8.16 -	<check_box label="Afspil musik når det er muligt(Bruger mere båndbredde)"
    8.17 -	     name="streaming_music" />
    8.18 -	<check_box label="Afspil video når det er muligt(Bruger mere båndbredde)"
    8.19 -	     name="streaming_video" />
    8.20 -	<check_box label="Afspil automatisk medie" name="auto_streaming_video" />
    8.21 -	<check_box label="Sluk lyd når vinduet er minimeret" name="mute_when_minimized" />
    8.22 -	<slider label="Doppler effekt" name="Doppler Effect" />
    8.23 -	<slider label="Rækkevidde" name="Distance Factor" />
    8.24 -	<slider label="Styrkefald/afstand" name="Rolloff Factor" />
    8.25 -	<spinner label="Penge lydstyrke" name="L$ Change Threshold" />
    8.26 -	<spinner label="Livspoint lydstyrke" name="Health Change Threshold" />
    8.27 -</panel>
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/indra/newview/skins/default/xui/da/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
     9.3 @@ -0,0 +1,24 @@
     9.4 +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
     9.5 +<panel label="Lyd &amp; video" name="Media panel">
     9.6 +	<text type="string" length="1" name="muting_text">
     9.7 +		Lydstyrke:
     9.8 +	</text>
     9.9 +	<text type="string" length="1" name="streaming_prefs_text">
    9.10 +		Streaming indstillinger:
    9.11 +	</text>
    9.12 +	<text type="string" length="1" name="audio_prefs_text">
    9.13 +		Lyd indstillinger:
    9.14 +	</text>
    9.15 +	<panel label="Lydstyrke" name="Volume Panel" />
    9.16 +	<check_box label="Afspil musik når det er muligt(Bruger mere båndbredde)"
    9.17 +	     name="streaming_music" />
    9.18 +	<check_box label="Afspil video når det er muligt(Bruger mere båndbredde)"
    9.19 +	     name="streaming_video" />
    9.20 +	<check_box label="Afspil automatisk medie" name="auto_streaming_video" />
    9.21 +	<check_box label="Sluk lyd når vinduet er minimeret" name="mute_when_minimized" />
    9.22 +	<slider label="Doppler effekt" name="Doppler Effect" />
    9.23 +	<slider label="Rækkevidde" name="Distance Factor" />
    9.24 +	<slider label="Styrkefald/afstand" name="Rolloff Factor" />
    9.25 +	<spinner label="Penge lydstyrke" name="L$ Change Threshold" />
    9.26 +	<spinner label="Livspoint lydstyrke" name="Health Change Threshold" />
    9.27 +</panel>
    10.1 --- a/indra/newview/skins/default/xui/de/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,69 +0,0 @@
    10.4 -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    10.5 -<panel label="Audio und Video" name="Media panel">
    10.6 -	<text type="string" length="1" name="muting_text">
    10.7 -		Lautstärke:
    10.8 -	</text>
    10.9 -	<check_box label="Audio stummschalten" name="disable audio" />
   10.10 -	<text name="streaming_prefs_text">
   10.11 -		Streaming-Einstellungen:
   10.12 -	</text>
   10.13 -	<text name="audio_prefs_text">
   10.14 -		Audio-Einstellungen:
   10.15 -	</text>
   10.16 -	<panel label="Lautstärke" name="Volume Panel" />
   10.17 -  <check_box label="Medien automatisch wiedergeben" name="auto_streaming_video" />
   10.18 -  <check_box label="Medienfilter (erhöhte Sicherheit)" name="media_filter" 
   10.19 -   tool_tip="Diese Option schaltet die Anzeige der URL jeder angebotenen Audio- und Medienquelle ein, und gibt Ihnen die Möglichkeit, 
   10.20 -das Abspielen zu erlauben oder zu verbieten. Auf Wunsch kann diese Entscheidung auch für alle anderen URLs der entsprechenden Domain gespeichert werden."/>
   10.21 -	<check_box label="Audio stummschalten, wenn Fenster minimiert ist"
   10.22 -	     name="mute_when_minimized" />
   10.23 -	<text type="string" length="1" name="streaming_text">
   10.24 -		Streaming:
   10.25 -	</text>
   10.26 -	<check_box label="Streaming-Musik abspielen, falls verfügbar" name="streaming_music" />
   10.27 -	<check_box label="Streaming-Media abspielen, falls verfügbar (mehr Bandbreite)"
   10.28 -	     name="streaming_video" />
   10.29 -	<text type="string" length="1" name="system_volume_text">
   10.30 -		Soundeffekte:
   10.31 -	</text>
   10.32 -	<text type="string" length="1" name="wind_volume_text">
   10.33 -		Windlautstärke:
   10.34 -	</text>
   10.35 -	<text type="string" length="1" name="footsteps_volume_text">
   10.36 -		Schrittlautstärke:
   10.37 -	</text>
   10.38 -	<text type="string" length="1" name="ui_volume_text">
   10.39 -		UI-Volumen:
   10.40 -	</text>
   10.41 -	<slider label="Dopplereffekt" name="Doppler Effect" />
   10.42 -	<slider label="Distanzfaktor" name="Distance Factor" />
   10.43 -	<slider label="Rolloff-Faktor" name="Rolloff Factor" />
   10.44 -	<spinner label="L$ Änderungs-Grenzwert" name="L$ Change Threshold" />
   10.45 -	<spinner label="Gesundheitsschwellwert" name="Health Change Threshold" />
   10.46 -	<text type="string" length="1" name="doppler_effect_text">
   10.47 -		Audio-Einstellungen:
   10.48 -	</text>
   10.49 -	<text type="string" length="1" name="distance_factor_text">
   10.50 -		Distanzfaktor:
   10.51 -	</text>
   10.52 -	<text type="string" length="1" name="rolloff_factor_text">
   10.53 -		Rolloff-Faktor:
   10.54 -	</text>
   10.55 -	<text type="string" length="1" name="default_upload_bitrate_text">
   10.56 -		Standard-Upload-Bitrate:
   10.57 -	</text>
   10.58 -	<radio_group name="bitrate">
   10.59 -		<radio_item type="string" length="1" name="32kbps">
   10.60 -			32 kbit/s
   10.61 -		</radio_item>
   10.62 -		<radio_item type="string" length="1" name="64kbps">
   10.63 -			64 kbit/s
   10.64 -		</radio_item>
   10.65 -		<radio_item type="string" length="1" name="96kbps">
   10.66 -			96 kbit/s
   10.67 -		</radio_item>
   10.68 -		<radio_item type="string" length="1" name="128kbps">
   10.69 -			128 kbit/s
   10.70 -		</radio_item>
   10.71 -	</radio_group>
   10.72 -</panel>
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/indra/newview/skins/default/xui/de/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    11.3 @@ -0,0 +1,69 @@
    11.4 +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    11.5 +<panel label="Audio und Video" name="Media panel">
    11.6 +	<text type="string" length="1" name="muting_text">
    11.7 +		Lautstärke:
    11.8 +	</text>
    11.9 +	<check_box label="Audio stummschalten" name="disable audio" />
   11.10 +	<text name="streaming_prefs_text">
   11.11 +		Streaming-Einstellungen:
   11.12 +	</text>
   11.13 +	<text name="audio_prefs_text">
   11.14 +		Audio-Einstellungen:
   11.15 +	</text>
   11.16 +	<panel label="Lautstärke" name="Volume Panel" />
   11.17 +  <check_box label="Medien automatisch wiedergeben" name="auto_streaming_video" />
   11.18 +  <check_box label="Medienfilter (erhöhte Sicherheit)" name="media_filter" 
   11.19 +   tool_tip="Diese Option schaltet die Anzeige der URL jeder angebotenen Audio- und Medienquelle ein, und gibt Ihnen die Möglichkeit, 
   11.20 +das Abspielen zu erlauben oder zu verbieten. Auf Wunsch kann diese Entscheidung auch für alle anderen URLs der entsprechenden Domain gespeichert werden."/>
   11.21 +	<check_box label="Audio stummschalten, wenn Fenster minimiert ist"
   11.22 +	     name="mute_when_minimized" />
   11.23 +	<text type="string" length="1" name="streaming_text">
   11.24 +		Streaming:
   11.25 +	</text>
   11.26 +	<check_box label="Streaming-Musik abspielen, falls verfügbar" name="streaming_music" />
   11.27 +	<check_box label="Streaming-Media abspielen, falls verfügbar (mehr Bandbreite)"
   11.28 +	     name="streaming_video" />
   11.29 +	<text type="string" length="1" name="system_volume_text">
   11.30 +		Soundeffekte:
   11.31 +	</text>
   11.32 +	<text type="string" length="1" name="wind_volume_text">
   11.33 +		Windlautstärke:
   11.34 +	</text>
   11.35 +	<text type="string" length="1" name="footsteps_volume_text">
   11.36 +		Schrittlautstärke:
   11.37 +	</text>
   11.38 +	<text type="string" length="1" name="ui_volume_text">
   11.39 +		UI-Volumen:
   11.40 +	</text>
   11.41 +	<slider label="Dopplereffekt" name="Doppler Effect" />
   11.42 +	<slider label="Distanzfaktor" name="Distance Factor" />
   11.43 +	<slider label="Rolloff-Faktor" name="Rolloff Factor" />
   11.44 +	<spinner label="L$ Änderungs-Grenzwert" name="L$ Change Threshold" />
   11.45 +	<spinner label="Gesundheitsschwellwert" name="Health Change Threshold" />
   11.46 +	<text type="string" length="1" name="doppler_effect_text">
   11.47 +		Audio-Einstellungen:
   11.48 +	</text>
   11.49 +	<text type="string" length="1" name="distance_factor_text">
   11.50 +		Distanzfaktor:
   11.51 +	</text>
   11.52 +	<text type="string" length="1" name="rolloff_factor_text">
   11.53 +		Rolloff-Faktor:
   11.54 +	</text>
   11.55 +	<text type="string" length="1" name="default_upload_bitrate_text">
   11.56 +		Standard-Upload-Bitrate:
   11.57 +	</text>
   11.58 +	<radio_group name="bitrate">
   11.59 +		<radio_item type="string" length="1" name="32kbps">
   11.60 +			32 kbit/s
   11.61 +		</radio_item>
   11.62 +		<radio_item type="string" length="1" name="64kbps">
   11.63 +			64 kbit/s
   11.64 +		</radio_item>
   11.65 +		<radio_item type="string" length="1" name="96kbps">
   11.66 +			96 kbit/s
   11.67 +		</radio_item>
   11.68 +		<radio_item type="string" length="1" name="128kbps">
   11.69 +			128 kbit/s
   11.70 +		</radio_item>
   11.71 +	</radio_group>
   11.72 +</panel>
    12.1 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,89 +0,0 @@
    12.4 -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    12.5 -<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
    12.6 -     height="408" label="Audio &amp; Video" left="102" mouse_opaque="true"
    12.7 -     name="Media panel" width="517">
    12.8 -  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
    12.9 -	     bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
   12.10 -	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
   12.11 -	     mouse_opaque="true" name="muting_text" v_pad="0" width="128">
   12.12 -    Volume:
   12.13 -  </text>
   12.14 -  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
   12.15 -	     bottom="-195" drop_shadow_visible="true" enabled="true" follows="left|top"
   12.16 -	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
   12.17 -	     mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
   12.18 -    Streaming Preferences:
   12.19 -  </text>
   12.20 -  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
   12.21 -	     bottom="-320" drop_shadow_visible="true" enabled="true" follows="left|top"
   12.22 -	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
   12.23 -	     mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
   12.24 -    Audio Preferences:
   12.25 -  </text>
   12.26 -  <panel border="true" bottom="-195" enabled="true" filename="panel_audio.xml"
   12.27 -	     follows="left|top|right|bottom" height="180" label="Volume" left="148"
   12.28 -	     mouse_opaque="true" name="Volume Panel" width="260" />
   12.29 -  <check_box bottom="-200" control_name="AudioStreamingMusic" enabled="true"
   12.30 -	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
   12.31 -	     label="Enable Streaming Music When Available"
   12.32 -	     left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
   12.33 -	     width="339" />
   12.34 -  <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
   12.35 -	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
   12.36 -	     label="Enable Streaming Media When Available"
   12.37 -	     left="142" mouse_opaque="true" name="streaming_video" radio_style="false"
   12.38 -	     width="338" />
   12.39 -  <check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" enabled="true"
   12.40 -	     follows="left|top" font="SansSerifSmall" height="16" width="338"
   12.41 -	     initial_value="true" label="Automatically play media" left="162"
   12.42 -	     mouse_opaque="true" name="auto_streaming_video" radio_style="false"
   12.43 -       tool_tip="If you have this enabled, regardless of whether you have media stopped or not, 
   12.44 -when you enter a new parcel your media will automatically turn on after a few seconds." />
   12.45 -  <check_box bottom_delta="-20" control_name="PhoenixAllowScriptedMedia2" enabled="true"
   12.46 -	     follows="left|top" font="SansSerifSmall" height="16" width="338"
   12.47 -	     initial_value="true" label="Let scripts control my play button" left="162"
   12.48 -	     mouse_opaque="true" name="scripted_media" radio_style="false"
   12.49 -       tool_tip="Having this turned on will prevent scripts from turning on your media (if it was already off) 
   12.50 -until you have pressed the play button yourself, or auto play turns it on." />
   12.51 -  <check_box bottom_delta="-20" control_name="PhoenixStopMusicOnParcelChange" enabled="true"
   12.52 -	     follows="left|top" font="SansSerifSmall" height="16" width="338"
   12.53 -	     initial_value="true" label="Turn off media when you change parcels." left="142"
   12.54 -	     mouse_opaque="true" name="auto_streaming_music" radio_style="false"
   12.55 -       tool_tip="When you enter into a new parcel, any steaming music or playing media will be turned off. 
   12.56 - This will last until it is either automatically turned on through auto play, a script, or your play button."/>
   12.57 -  <check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
   12.58 -	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
   12.59 -	     label="Media Filter (increased security)" width="338"
   12.60 -	     left="142" mouse_opaque="true" name="media_filter" radio_style="false"
   12.61 -       tool_tip="Turning this on will show you the URL to every media and audio source you are offered and 
   12.62 -give you the choice to allow or deny playing it, and optionally to save that choice for all URLs from that domain."/>
   12.63 -  <button bottom_delta="-2" enabled="false" follows="left|top|right"
   12.64 -	     font="SansSerif" halign="center" height="22" label="Settings"
   12.65 -	     left_delta="195" mouse_opaque="true"
   12.66 -	     name="open_media_lists" scale_image="true" width="95"
   12.67 -		 tool_tip="Open Media Filter Settings."/>
   12.68 -  <check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true"
   12.69 -	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
   12.70 -	     label="Mute Audio When Window Minimized" left="142" mouse_opaque="true"
   12.71 -	     name="mute_when_minimized" radio_style="false" width="215" />
   12.72 -  <slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true"
   12.73 -	     enabled="true" follows="left|top" height="15" increment="0.1"
   12.74 -	     initial_val="1" label="Doppler Effect" label_width="100" left="148"
   12.75 -	     max_val="2" min_val="0" mouse_opaque="true" name="Doppler Effect"
   12.76 -	     show_text="true" width="250" />
   12.77 -  <slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true"
   12.78 -	     enabled="true" follows="left|top" height="15" increment="0.1"
   12.79 -	     initial_val="1" label="Rolloff Factor" label_width="100" left="148"
   12.80 -	     max_val="2" min_val="0" mouse_opaque="true" name="Rolloff Factor"
   12.81 -	     show_text="true" width="250" />
   12.82 -  <spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
   12.83 -	     enabled="true" follows="left|top" height="16" increment="10"
   12.84 -	     initial_val="10" label="L$ Change Threshold" label_width="128" left="148"
   12.85 -	     max_val="10000" min_val="0" mouse_opaque="true" name="L$ Change Threshold"
   12.86 -	     width="192" tool_tip="Plays a sound when money is spent or recieved higher than the amount set here." />
   12.87 -  <spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold"
   12.88 -	     decimal_digits="0" enabled="true" follows="left|top" height="16"
   12.89 -	     increment="10" initial_val="20" label="Health Change Threshold"
   12.90 -	     label_width="128" left="148" max_val="10000" min_val="0"
   12.91 -	     mouse_opaque="true" name="Health Change Threshold" width="192" />
   12.92 -</panel>
    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    13.3 @@ -0,0 +1,89 @@
    13.4 +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    13.5 +<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
    13.6 +     height="408" label="Audio &amp; Video" left="102" mouse_opaque="true"
    13.7 +     name="Media panel" width="517">
    13.8 +  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
    13.9 +	     bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
   13.10 +	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
   13.11 +	     mouse_opaque="true" name="muting_text" v_pad="0" width="128">
   13.12 +    Volume:
   13.13 +  </text>
   13.14 +  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
   13.15 +	     bottom="-195" drop_shadow_visible="true" enabled="true" follows="left|top"
   13.16 +	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
   13.17 +	     mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
   13.18 +    Streaming Preferences:
   13.19 +  </text>
   13.20 +  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
   13.21 +	     bottom="-320" drop_shadow_visible="true" enabled="true" follows="left|top"
   13.22 +	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
   13.23 +	     mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
   13.24 +    Audio Preferences:
   13.25 +  </text>
   13.26 +  <panel border="true" bottom="-195" enabled="true" filename="panel_audio.xml"
   13.27 +	     follows="left|top|right|bottom" height="180" label="Volume" left="148"
   13.28 +	     mouse_opaque="true" name="Volume Panel" width="260" />
   13.29 +  <check_box bottom="-200" control_name="AudioStreamingMusic" enabled="true"
   13.30 +	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
   13.31 +	     label="Enable Streaming Music When Available"
   13.32 +	     left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
   13.33 +	     width="339" />
   13.34 +  <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
   13.35 +	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
   13.36 +	     label="Enable Streaming Media When Available"
   13.37 +	     left="142" mouse_opaque="true" name="streaming_video" radio_style="false"
   13.38 +	     width="338" />
   13.39 +  <check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" enabled="true"
   13.40 +	     follows="left|top" font="SansSerifSmall" height="16" width="338"
   13.41 +	     initial_value="true" label="Automatically play media" left="162"
   13.42 +	     mouse_opaque="true" name="auto_streaming_video" radio_style="false"
   13.43 +       tool_tip="If you have this enabled, regardless of whether you have media stopped or not, 
   13.44 +when you enter a new parcel your media will automatically turn on after a few seconds." />
   13.45 +  <check_box bottom_delta="-20" control_name="PhoenixAllowScriptedMedia2" enabled="true"
   13.46 +	     follows="left|top" font="SansSerifSmall" height="16" width="338"
   13.47 +	     initial_value="true" label="Let scripts control my play button" left="162"
   13.48 +	     mouse_opaque="true" name="scripted_media" radio_style="false"
   13.49 +       tool_tip="Having this turned on will prevent scripts from turning on your media (if it was already off) 
   13.50 +until you have pressed the play button yourself, or auto play turns it on." />
   13.51 +  <check_box bottom_delta="-20" control_name="PhoenixStopMusicOnParcelChange" enabled="true"
   13.52 +	     follows="left|top" font="SansSerifSmall" height="16" width="338"
   13.53 +	     initial_value="true" label="Turn off media when you change parcels." left="142"
   13.54 +	     mouse_opaque="true" name="auto_streaming_music" radio_style="false"
   13.55 +       tool_tip="When you enter into a new parcel, any steaming music or playing media will be turned off. 
   13.56 + This will last until it is either automatically turned on through auto play, a script, or your play button."/>
   13.57 +  <check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
   13.58 +	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
   13.59 +	     label="Media Filter (increased security)" width="338"
   13.60 +	     left="142" mouse_opaque="true" name="media_filter" radio_style="false"
   13.61 +       tool_tip="Turning this on will show you the URL to every media and audio source you are offered and 
   13.62 +give you the choice to allow or deny playing it, and optionally to save that choice for all URLs from that domain."/>
   13.63 +  <button bottom_delta="-2" enabled="false" follows="left|top|right"
   13.64 +	     font="SansSerif" halign="center" height="22" label="Settings"
   13.65 +	     left_delta="195" mouse_opaque="true"
   13.66 +	     name="open_media_lists" scale_image="true" width="95"
   13.67 +		 tool_tip="Open Media Filter Settings."/>
   13.68 +  <check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true"
   13.69 +	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
   13.70 +	     label="Mute Audio When Window Minimized" left="142" mouse_opaque="true"
   13.71 +	     name="mute_when_minimized" radio_style="false" width="215" />
   13.72 +  <slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true"
   13.73 +	     enabled="true" follows="left|top" height="15" increment="0.1"
   13.74 +	     initial_val="1" label="Doppler Effect" label_width="100" left="148"
   13.75 +	     max_val="2" min_val="0" mouse_opaque="true" name="Doppler Effect"
   13.76 +	     show_text="true" width="250" />
   13.77 +  <slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true"
   13.78 +	     enabled="true" follows="left|top" height="15" increment="0.1"
   13.79 +	     initial_val="1" label="Rolloff Factor" label_width="100" left="148"
   13.80 +	     max_val="2" min_val="0" mouse_opaque="true" name="Rolloff Factor"
   13.81 +	     show_text="true" width="250" />
   13.82 +  <spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
   13.83 +	     enabled="true" follows="left|top" height="16" increment="10"
   13.84 +	     initial_val="10" label="L$ Change Threshold" label_width="128" left="148"
   13.85 +	     max_val="10000" min_val="0" mouse_opaque="true" name="L$ Change Threshold"
   13.86 +	     width="192" tool_tip="Plays a sound when money is spent or recieved higher than the amount set here." />
   13.87 +  <spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold"
   13.88 +	     decimal_digits="0" enabled="true" follows="left|top" height="16"
   13.89 +	     increment="10" initial_val="20" label="Health Change Threshold"
   13.90 +	     label_width="128" left="148" max_val="10000" min_val="0"
   13.91 +	     mouse_opaque="true" name="Health Change Threshold" width="192" />
   13.92 +</panel>
    14.1 --- a/indra/newview/skins/default/xui/es/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,24 +0,0 @@
    14.4 -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
    14.5 -<panel label="Audio y Vídeo" name="Media panel">
    14.6 -	<text length="1" name="muting_text" type="string">
    14.7 -		Volumen:
    14.8 -	</text>
    14.9 -	<text name="streaming_prefs_text" bottom="-195" >
   14.10 -		Preferencias multimedia:
   14.11 -	</text>
   14.12 -	<text name="audio_prefs_text">
   14.13 -		Preferencias de sonido:
   14.14 -	</text>
   14.15 -	<panel label="Volumen" name="Volume Panel"/>
   14.16 -	<check_box bottom="-200" height="32" label="Si hay música, reproducirla en streaming &#10;
   14.17 -(usa más ancho de banda)" name="streaming_music"/>
   14.18 -	<check_box bottom_delta="-32" height="32" label="Si hay media, reproducirlos en streaming &#10;
   14.19 -(usa más ancho de banda)" name="streaming_video"/>
   14.20 -	<check_box bottom_delta="-32" label="Reproducir automáticamente los media" name="auto_streaming_video"/>
   14.21 -	<check_box label="Silenciar el sonido al minimizar la ventana" name="mute_when_minimized"/>
   14.22 -	<slider label="Efecto Doppler" name="Doppler Effect" label_width="140" width="270" />
   14.23 -	<slider label="Distancia de escucha" name="Distance Factor" label_width="140" width="270" />
   14.24 -	<slider label="Nivel de atenuación" name="Rolloff Factor" label_width="140" width="270" />
   14.25 -	<spinner label="Avisar de transacción de L$ desde" name="L$ Change Threshold" label_width="195" width="259"/>
   14.26 -	<spinner label="Avisar del estado de la vida desde" name="Health Change Threshold" label_width="195" width="259"/>
   14.27 -</panel>
    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/indra/newview/skins/default/xui/es/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    15.3 @@ -0,0 +1,24 @@
    15.4 +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
    15.5 +<panel label="Audio y Vídeo" name="Media panel">
    15.6 +	<text length="1" name="muting_text" type="string">
    15.7 +		Volumen:
    15.8 +	</text>
    15.9 +	<text name="streaming_prefs_text" bottom="-195" >
   15.10 +		Preferencias multimedia:
   15.11 +	</text>
   15.12 +	<text name="audio_prefs_text">
   15.13 +		Preferencias de sonido:
   15.14 +	</text>
   15.15 +	<panel label="Volumen" name="Volume Panel"/>
   15.16 +	<check_box bottom="-200" height="32" label="Si hay música, reproducirla en streaming &#10;
   15.17 +(usa más ancho de banda)" name="streaming_music"/>
   15.18 +	<check_box bottom_delta="-32" height="32" label="Si hay media, reproducirlos en streaming &#10;
   15.19 +(usa más ancho de banda)" name="streaming_video"/>
   15.20 +	<check_box bottom_delta="-32" label="Reproducir automáticamente los media" name="auto_streaming_video"/>
   15.21 +	<check_box label="Silenciar el sonido al minimizar la ventana" name="mute_when_minimized"/>
   15.22 +	<slider label="Efecto Doppler" name="Doppler Effect" label_width="140" width="270" />
   15.23 +	<slider label="Distancia de escucha" name="Distance Factor" label_width="140" width="270" />
   15.24 +	<slider label="Nivel de atenuación" name="Rolloff Factor" label_width="140" width="270" />
   15.25 +	<spinner label="Avisar de transacción de L$ desde" name="L$ Change Threshold" label_width="195" width="259"/>
   15.26 +	<spinner label="Avisar del estado de la vida desde" name="Health Change Threshold" label_width="195" width="259"/>
   15.27 +</panel>
    16.1 --- a/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    16.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.3 @@ -1,29 +0,0 @@
    16.4 -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
    16.5 -<panel label="Audio et vidéo" name="Media panel">
    16.6 -	<text length="1" name="muting_text" type="string">
    16.7 -		Volume :
    16.8 -	</text>
    16.9 -	<panel name="Volume Panel" width="249"/>
   16.10 -	<check_box label="Couper le son" name="disable audio"/>
   16.11 -	<text bottom="-195" name="streaming_prefs_text" width="145">
   16.12 -		Média :
   16.13 -	</text>
   16.14 -	<text name="audio_prefs_text">
   16.15 -		Audio :
   16.16 -	</text>
   16.17 -	<panel label="Volume" name="Volume Panel"/>
   16.18 -  <check_box label="Filtre de Medias (plus de securité)" name="media_filter"
   16.19 -   tooltip="Permettre ceci t'affichera l'URL à chaque source de medias et audio que vous êtes offert et donnez-vous le 
   16.20 -choix pour laisser ou refuser le jouer,et sauvegarder sur option ce choix pour tout l'URLs de ce domaine."/>
   16.21 -  <check_box label="Couper le son lorsque la fenêtre est minimisée" name="mute_when_minimized"/>
   16.22 -	<check_box bottom="-200" height="32" label="Jouer la musique disponible &#10;
   16.23 -(consommateur en bande passante)" name="streaming_music"/>
   16.24 -	<check_box bottom_delta="-32" height="32" label="Jouer le média disponible &#10;
   16.25 -(consommateur en bande passante)" name="streaming_video"/>
   16.26 -	<check_box bottom_delta="-32" label="Lire automatiquement le média" name="auto_streaming_video"/>
   16.27 -	<slider label="Effet Doppler" label_width="115" name="Doppler Effect"/>
   16.28 -	<slider label="Facteur d&apos;éloignement" label_width="115" name="Distance Factor"/>
   16.29 -	<slider label="Facteur d&apos;atténuation" label_width="115" name="Rolloff Factor"/>
   16.30 -	<spinner label="Alerte L$" name="L$ Change Threshold"/>
   16.31 -	<spinner label="Alerte santé" name="Health Change Threshold"/>
   16.32 -</panel>
    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/indra/newview/skins/default/xui/fr/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    17.3 @@ -0,0 +1,29 @@
    17.4 +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
    17.5 +<panel label="Audio et vidéo" name="Media panel">
    17.6 +	<text length="1" name="muting_text" type="string">
    17.7 +		Volume :
    17.8 +	</text>
    17.9 +	<panel name="Volume Panel" width="249"/>
   17.10 +	<check_box label="Couper le son" name="disable audio"/>
   17.11 +	<text bottom="-195" name="streaming_prefs_text" width="145">
   17.12 +		Média :
   17.13 +	</text>
   17.14 +	<text name="audio_prefs_text">
   17.15 +		Audio :
   17.16 +	</text>
   17.17 +	<panel label="Volume" name="Volume Panel"/>
   17.18 +  <check_box label="Filtre de Medias (plus de securité)" name="media_filter"
   17.19 +   tooltip="Permettre ceci t'affichera l'URL à chaque source de medias et audio que vous êtes offert et donnez-vous le 
   17.20 +choix pour laisser ou refuser le jouer,et sauvegarder sur option ce choix pour tout l'URLs de ce domaine."/>
   17.21 +  <check_box label="Couper le son lorsque la fenêtre est minimisée" name="mute_when_minimized"/>
   17.22 +	<check_box bottom="-200" height="32" label="Jouer la musique disponible &#10;
   17.23 +(consommateur en bande passante)" name="streaming_music"/>
   17.24 +	<check_box bottom_delta="-32" height="32" label="Jouer le média disponible &#10;
   17.25 +(consommateur en bande passante)" name="streaming_video"/>
   17.26 +	<check_box bottom_delta="-32" label="Lire automatiquement le média" name="auto_streaming_video"/>
   17.27 +	<slider label="Effet Doppler" label_width="115" name="Doppler Effect"/>
   17.28 +	<slider label="Facteur d&apos;éloignement" label_width="115" name="Distance Factor"/>
   17.29 +	<slider label="Facteur d&apos;atténuation" label_width="115" name="Rolloff Factor"/>
   17.30 +	<spinner label="Alerte L$" name="L$ Change Threshold"/>
   17.31 +	<spinner label="Alerte santé" name="Health Change Threshold"/>
   17.32 +</panel>
    18.1 --- a/indra/newview/skins/default/xui/hu/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,25 +0,0 @@
    18.4 -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    18.5 -<panel label="Hang és videó" name="Media panel">
    18.6 -	<text type="string" length="1" name="muting_text">
    18.7 -		Hangerő:
    18.8 -	</text>
    18.9 -	<text type="string" length="1" name="streaming_prefs_text">
   18.10 -		Streaming
   18.11 -tulajdonságok:
   18.12 -	</text>
   18.13 -	<text type="string" length="1" name="audio_prefs_text">
   18.14 -		Hang tulajdonságok:
   18.15 -	</text>
   18.16 -	<panel label="Hangerő" name="Volume Panel" />
   18.17 -	<check_box label="Streaming zene lejátszása (nagyobb sávszélességet igényel)"
   18.18 -	     name="streaming_music" />
   18.19 -	<check_box label="Streaming videó lejátszása (nagyobb sávszélességet igényel)"
   18.20 -	     name="streaming_video" />
   18.21 -	<check_box label="Média automatikus lejátszása" name="auto_streaming_video" />
   18.22 -	<check_box label="Ablak kicsinyítésekor a hang némítása" name="mute_when_minimized" />
   18.23 -	<slider label="Doppler hatás" name="Doppler Effect" />
   18.24 -	<slider label="Távolsági hatóerő" name="Distance Factor" />
   18.25 -	<slider label="Görgetési tényező" name="Rolloff Factor" />
   18.26 -	<spinner label="L$ átváltási küszöb" name="L$ Change Threshold" label_width="165" width="229"/>
   18.27 -	<spinner label="Testi épség megtartási küszöb" name="Health Change Threshold" label_width="165" width="229" />
   18.28 -</panel>
    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/indra/newview/skins/default/xui/hu/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    19.3 @@ -0,0 +1,25 @@
    19.4 +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    19.5 +<panel label="Hang és videó" name="Media panel">
    19.6 +	<text type="string" length="1" name="muting_text">
    19.7 +		Hangerő:
    19.8 +	</text>
    19.9 +	<text type="string" length="1" name="streaming_prefs_text">
   19.10 +		Streaming
   19.11 +tulajdonságok:
   19.12 +	</text>
   19.13 +	<text type="string" length="1" name="audio_prefs_text">
   19.14 +		Hang tulajdonságok:
   19.15 +	</text>
   19.16 +	<panel label="Hangerő" name="Volume Panel" />
   19.17 +	<check_box label="Streaming zene lejátszása (nagyobb sávszélességet igényel)"
   19.18 +	     name="streaming_music" />
   19.19 +	<check_box label="Streaming videó lejátszása (nagyobb sávszélességet igényel)"
   19.20 +	     name="streaming_video" />
   19.21 +	<check_box label="Média automatikus lejátszása" name="auto_streaming_video" />
   19.22 +	<check_box label="Ablak kicsinyítésekor a hang némítása" name="mute_when_minimized" />
   19.23 +	<slider label="Doppler hatás" name="Doppler Effect" />
   19.24 +	<slider label="Távolsági hatóerő" name="Distance Factor" />
   19.25 +	<slider label="Görgetési tényező" name="Rolloff Factor" />
   19.26 +	<spinner label="L$ átváltási küszöb" name="L$ Change Threshold" label_width="165" width="229"/>
   19.27 +	<spinner label="Testi épség megtartási küszöb" name="Health Change Threshold" label_width="165" width="229" />
   19.28 +</panel>
    20.1 --- a/indra/newview/skins/default/xui/it/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    20.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.3 @@ -1,24 +0,0 @@
    20.4 -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
    20.5 -<panel label="Audio &amp; Video" name="Media panel">
    20.6 -	<text name="muting_text">
    20.7 -		Volume:
    20.8 -	</text>
    20.9 -	<text name="streaming_prefs_text" bottom="-195" >
   20.10 -		Preferenze Streaming:
   20.11 -	</text>
   20.12 -	<text name="audio_prefs_text">
   20.13 -		Preferenze Audio:
   20.14 -	</text>
   20.15 -	<panel label="Volume" name="Volume Panel"/>
   20.16 -	<check_box bottom="-200" height="32" label="Ascolta il canale della musica se è disponibile &#10;
   20.17 -(usa più banda)" name="streaming_music"/>
   20.18 -	<check_box bottom_delta="-32" height="32" label="Guarda i video se sono disponibili &#10;
   20.19 -(usa più banda)" name="streaming_video"/>
   20.20 -	<check_box bottom_delta="-32" label="Attiva automaticamente i video" name="auto_streaming_video"/>
   20.21 -	<check_box label="Muta l&apos;audio quando minimizzi la finestra" name="mute_when_minimized"/>
   20.22 -	<slider label="Effetto Doppler" name="Doppler Effect" label_width="140" width="270" />
   20.23 -	<slider label="Fattore di Distanza" name="Distance Factor" label_width="140" width="270"/>
   20.24 -	<slider label="Fattore di Allontanamento" name="Rolloff Factor" label_width="140" width="270"/>
   20.25 -	<spinner label="Suono di Avviso Transazioni &#8805; a L$" name="L$ Change Threshold" label_width="195" width="259"/>
   20.26 -	<spinner label="Livello vitale dell&apos;avatar" name="Health Change Threshold" label_width="195" width="259"/>
   20.27 -</panel>
    21.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.2 +++ b/indra/newview/skins/default/xui/it/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    21.3 @@ -0,0 +1,24 @@
    21.4 +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
    21.5 +<panel label="Audio &amp; Video" name="Media panel">
    21.6 +	<text name="muting_text">
    21.7 +		Volume:
    21.8 +	</text>
    21.9 +	<text name="streaming_prefs_text" bottom="-195" >
   21.10 +		Preferenze Streaming:
   21.11 +	</text>
   21.12 +	<text name="audio_prefs_text">
   21.13 +		Preferenze Audio:
   21.14 +	</text>
   21.15 +	<panel label="Volume" name="Volume Panel"/>
   21.16 +	<check_box bottom="-200" height="32" label="Ascolta il canale della musica se è disponibile &#10;
   21.17 +(usa più banda)" name="streaming_music"/>
   21.18 +	<check_box bottom_delta="-32" height="32" label="Guarda i video se sono disponibili &#10;
   21.19 +(usa più banda)" name="streaming_video"/>
   21.20 +	<check_box bottom_delta="-32" label="Attiva automaticamente i video" name="auto_streaming_video"/>
   21.21 +	<check_box label="Muta l&apos;audio quando minimizzi la finestra" name="mute_when_minimized"/>
   21.22 +	<slider label="Effetto Doppler" name="Doppler Effect" label_width="140" width="270" />
   21.23 +	<slider label="Fattore di Distanza" name="Distance Factor" label_width="140" width="270"/>
   21.24 +	<slider label="Fattore di Allontanamento" name="Rolloff Factor" label_width="140" width="270"/>
   21.25 +	<spinner label="Suono di Avviso Transazioni &#8805; a L$" name="L$ Change Threshold" label_width="195" width="259"/>
   21.26 +	<spinner label="Livello vitale dell&apos;avatar" name="Health Change Threshold" label_width="195" width="259"/>
   21.27 +</panel>
    22.1 --- a/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    22.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.3 @@ -1,69 +0,0 @@
    22.4 -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    22.5 -<panel label="音声とビデオ" name="Media panel">
    22.6 -	<text type="string" length="1" name="muting_text">
    22.7 -		ボリューム:
    22.8 -	</text>
    22.9 -	<check_box label="オーディオをミュート" name="disable audio" />
   22.10 -	<text name="streaming_prefs_text">
   22.11 -		ストリーム環境設定:
   22.12 -	</text>
   22.13 -	<text name="audio_prefs_text">
   22.14 -		オーディオ環境設定:
   22.15 -	</text>
   22.16 -	<panel label="ボリューム" name="Volume Panel" />
   22.17 -	<check_box label="メディアを自動再生" name="auto_streaming_video" />
   22.18 -	<check_box
   22.19 -	     label="ウィンドウが最小化されたときにオーディオをミュート"
   22.20 -	     name="mute_when_minimized" />
   22.21 -	<text type="string" length="1" name="streaming_text">
   22.22 -		ストリーミング:
   22.23 -	</text>
   22.24 -	<check_box label="音楽がある場合再生する(通信が重くなる)"
   22.25 -	     name="streaming_music" />
   22.26 -	<check_box
   22.27 -	     label="ストリーミング・メディア使用可時に再生(帯域幅の消費増)"
   22.28 -	     name="streaming_video" />
   22.29 -	<text type="string" length="1" name="system_volume_text">
   22.30 -		サウンド効果:
   22.31 -	</text>
   22.32 -	<text type="string" length="1" name="wind_volume_text">
   22.33 -		風の音量:
   22.34 -	</text>
   22.35 -	<text type="string" length="1" name="footsteps_volume_text">
   22.36 -		足音:
   22.37 -	</text>
   22.38 -	<text type="string" length="1" name="ui_volume_text">
   22.39 -		UI音量:
   22.40 -	</text>
   22.41 -	<slider label="ドップラー効果" name="Doppler Effect" />
   22.42 -	<slider label="遠隔要因" name="Distance Factor" />
   22.43 -	<slider label="ロールオフ係数" name="Rolloff Factor" />
   22.44 -	<spinner label="L$変更基準点" name="L$ Change Threshold" />
   22.45 -	<spinner label="ヘルス変化基準点" name="Health Change Threshold" />
   22.46 -	<text type="string" length="1" name="doppler_effect_text">
   22.47 -		オーディオ環境設定:
   22.48 -	</text>
   22.49 -	<text type="string" length="1" name="distance_factor_text">
   22.50 -		距離係数:
   22.51 -	</text>
   22.52 -	<text type="string" length="1" name="rolloff_factor_text">
   22.53 -		ロールオフ:
   22.54 -	</text>
   22.55 -	<text type="string" length="1" name="default_upload_bitrate_text">
   22.56 -		デフォルトUL速度:
   22.57 -	</text>
   22.58 -	<radio_group name="bitrate">
   22.59 -		<radio_item type="string" length="1" name="32kbps">
   22.60 -			32kbps
   22.61 -		</radio_item>
   22.62 -		<radio_item type="string" length="1" name="64kbps">
   22.63 -			64kbps
   22.64 -		</radio_item>
   22.65 -		<radio_item type="string" length="1" name="96kbps">
   22.66 -			96kbps
   22.67 -		</radio_item>
   22.68 -		<radio_item type="string" length="1" name="128kbps">
   22.69 -			128kbps
   22.70 -		</radio_item>
   22.71 -	</radio_group>
   22.72 -</panel>
    23.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.2 +++ b/indra/newview/skins/default/xui/ja/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    23.3 @@ -0,0 +1,69 @@
    23.4 +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    23.5 +<panel label="音声とビデオ" name="Media panel">
    23.6 +	<text type="string" length="1" name="muting_text">
    23.7 +		ボリューム:
    23.8 +	</text>
    23.9 +	<check_box label="オーディオをミュート" name="disable audio" />
   23.10 +	<text name="streaming_prefs_text">
   23.11 +		ストリーム環境設定:
   23.12 +	</text>
   23.13 +	<text name="audio_prefs_text">
   23.14 +		オーディオ環境設定:
   23.15 +	</text>
   23.16 +	<panel label="ボリューム" name="Volume Panel" />
   23.17 +	<check_box label="メディアを自動再生" name="auto_streaming_video" />
   23.18 +	<check_box
   23.19 +	     label="ウィンドウが最小化されたときにオーディオをミュート"
   23.20 +	     name="mute_when_minimized" />
   23.21 +	<text type="string" length="1" name="streaming_text">
   23.22 +		ストリーミング:
   23.23 +	</text>
   23.24 +	<check_box label="音楽がある場合再生する(通信が重くなる)"
   23.25 +	     name="streaming_music" />
   23.26 +	<check_box
   23.27 +	     label="ストリーミング・メディア使用可時に再生(帯域幅の消費増)"
   23.28 +	     name="streaming_video" />
   23.29 +	<text type="string" length="1" name="system_volume_text">
   23.30 +		サウンド効果:
   23.31 +	</text>
   23.32 +	<text type="string" length="1" name="wind_volume_text">
   23.33 +		風の音量:
   23.34 +	</text>
   23.35 +	<text type="string" length="1" name="footsteps_volume_text">
   23.36 +		足音:
   23.37 +	</text>
   23.38 +	<text type="string" length="1" name="ui_volume_text">
   23.39 +		UI音量:
   23.40 +	</text>
   23.41 +	<slider label="ドップラー効果" name="Doppler Effect" />
   23.42 +	<slider label="遠隔要因" name="Distance Factor" />
   23.43 +	<slider label="ロールオフ係数" name="Rolloff Factor" />
   23.44 +	<spinner label="L$変更基準点" name="L$ Change Threshold" />
   23.45 +	<spinner label="ヘルス変化基準点" name="Health Change Threshold" />
   23.46 +	<text type="string" length="1" name="doppler_effect_text">
   23.47 +		オーディオ環境設定:
   23.48 +	</text>
   23.49 +	<text type="string" length="1" name="distance_factor_text">
   23.50 +		距離係数:
   23.51 +	</text>
   23.52 +	<text type="string" length="1" name="rolloff_factor_text">
   23.53 +		ロールオフ:
   23.54 +	</text>
   23.55 +	<text type="string" length="1" name="default_upload_bitrate_text">
   23.56 +		デフォルトUL速度:
   23.57 +	</text>
   23.58 +	<radio_group name="bitrate">
   23.59 +		<radio_item type="string" length="1" name="32kbps">
   23.60 +			32kbps
   23.61 +		</radio_item>
   23.62 +		<radio_item type="string" length="1" name="64kbps">
   23.63 +			64kbps
   23.64 +		</radio_item>
   23.65 +		<radio_item type="string" length="1" name="96kbps">
   23.66 +			96kbps
   23.67 +		</radio_item>
   23.68 +		<radio_item type="string" length="1" name="128kbps">
   23.69 +			128kbps
   23.70 +		</radio_item>
   23.71 +	</radio_group>
   23.72 +</panel>
    24.1 --- a/indra/newview/skins/default/xui/ko/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    24.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.3 @@ -1,67 +0,0 @@
    24.4 -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    24.5 -<panel label="사운드 &amp; 비디오" name="Media panel">
    24.6 -	<text type="string" length="1" name="muting_text">
    24.7 -		볼륨:
    24.8 -	</text>
    24.9 -	<check_box label="오디오 음소거" name="disable audio" />
   24.10 -	<text name="streaming_prefs_text">
   24.11 -		스트리밍 환경 설정:
   24.12 -	</text>
   24.13 -	<text name="audio_prefs_text">
   24.14 -		오디오 환경 설정:
   24.15 -	</text>
   24.16 -	<panel label="볼륨" name="Volume Panel" />
   24.17 -	<check_box label="자동으로 미디어 재생" name="auto_streaming_video" />
   24.18 -	<check_box label="창을 최소화 할 때 오디오 음소거" name="mute_when_minimized" />
   24.19 -	<text type="string" length="1" name="streaming_text">
   24.20 -		스트리밍:
   24.21 -	</text>
   24.22 -	<check_box label="스트리밍 음악 재생(더 많은 대역폭 사용)"
   24.23 -	     name="streaming_music" />
   24.24 -	<check_box
   24.25 -	     label="가능한 경우 스트리밍 미디어 재생(더 많은 대역폭 사용)"
   24.26 -	     name="streaming_video" />
   24.27 -	<text type="string" length="1" name="system_volume_text">
   24.28 -		사운드 효과:
   24.29 -	</text>
   24.30 -	<text type="string" length="1" name="wind_volume_text">
   24.31 -		바람 소리:
   24.32 -	</text>
   24.33 -	<text type="string" length="1" name="footsteps_volume_text">
   24.34 -		발자국 소리:
   24.35 -	</text>
   24.36 -	<text type="string" length="1" name="ui_volume_text">
   24.37 -		메뉴 효과음:
   24.38 -	</text>
   24.39 -	<slider label="도플러 효과" name="Doppler Effect" />
   24.40 -	<slider label="거리 요인" name="Distance Factor" />
   24.41 -	<slider label="롤오프 요인" name="Rolloff Factor" />
   24.42 -	<spinner label="L$ 변화 알림" name="L$ Change Threshold" />
   24.43 -	<spinner label="건강변화 알림" name="Health Change Threshold" />
   24.44 -	<text type="string" length="1" name="doppler_effect_text">
   24.45 -		오디오 환경 설정:
   24.46 -	</text>
   24.47 -	<text type="string" length="1" name="distance_factor_text">
   24.48 -		거리 설정:
   24.49 -	</text>
   24.50 -	<text type="string" length="1" name="rolloff_factor_text">
   24.51 -		롤오프 요인:
   24.52 -	</text>
   24.53 -	<text type="string" length="1" name="default_upload_bitrate_text">
   24.54 -		기본 업로드 비트율:
   24.55 -	</text>
   24.56 -	<radio_group name="bitrate">
   24.57 -		<radio_item type="string" length="1" name="32kbps">
   24.58 -			32kbps
   24.59 -		</radio_item>
   24.60 -		<radio_item type="string" length="1" name="64kbps">
   24.61 -			64kbps
   24.62 -		</radio_item>
   24.63 -		<radio_item type="string" length="1" name="96kbps">
   24.64 -			96kbps
   24.65 -		</radio_item>
   24.66 -		<radio_item type="string" length="1" name="128kbps">
   24.67 -			128kbps
   24.68 -		</radio_item>
   24.69 -	</radio_group>
   24.70 -</panel>
    25.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.2 +++ b/indra/newview/skins/default/xui/ko/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    25.3 @@ -0,0 +1,67 @@
    25.4 +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    25.5 +<panel label="사운드 &amp; 비디오" name="Media panel">
    25.6 +	<text type="string" length="1" name="muting_text">
    25.7 +		볼륨:
    25.8 +	</text>
    25.9 +	<check_box label="오디오 음소거" name="disable audio" />
   25.10 +	<text name="streaming_prefs_text">
   25.11 +		스트리밍 환경 설정:
   25.12 +	</text>
   25.13 +	<text name="audio_prefs_text">
   25.14 +		오디오 환경 설정:
   25.15 +	</text>
   25.16 +	<panel label="볼륨" name="Volume Panel" />
   25.17 +	<check_box label="자동으로 미디어 재생" name="auto_streaming_video" />
   25.18 +	<check_box label="창을 최소화 할 때 오디오 음소거" name="mute_when_minimized" />
   25.19 +	<text type="string" length="1" name="streaming_text">
   25.20 +		스트리밍:
   25.21 +	</text>
   25.22 +	<check_box label="스트리밍 음악 재생(더 많은 대역폭 사용)"
   25.23 +	     name="streaming_music" />
   25.24 +	<check_box
   25.25 +	     label="가능한 경우 스트리밍 미디어 재생(더 많은 대역폭 사용)"
   25.26 +	     name="streaming_video" />
   25.27 +	<text type="string" length="1" name="system_volume_text">
   25.28 +		사운드 효과:
   25.29 +	</text>
   25.30 +	<text type="string" length="1" name="wind_volume_text">
   25.31 +		바람 소리:
   25.32 +	</text>
   25.33 +	<text type="string" length="1" name="footsteps_volume_text">
   25.34 +		발자국 소리:
   25.35 +	</text>
   25.36 +	<text type="string" length="1" name="ui_volume_text">
   25.37 +		메뉴 효과음:
   25.38 +	</text>
   25.39 +	<slider label="도플러 효과" name="Doppler Effect" />
   25.40 +	<slider label="거리 요인" name="Distance Factor" />
   25.41 +	<slider label="롤오프 요인" name="Rolloff Factor" />
   25.42 +	<spinner label="L$ 변화 알림" name="L$ Change Threshold" />
   25.43 +	<spinner label="건강변화 알림" name="Health Change Threshold" />
   25.44 +	<text type="string" length="1" name="doppler_effect_text">
   25.45 +		오디오 환경 설정:
   25.46 +	</text>
   25.47 +	<text type="string" length="1" name="distance_factor_text">
   25.48 +		거리 설정:
   25.49 +	</text>
   25.50 +	<text type="string" length="1" name="rolloff_factor_text">
   25.51 +		롤오프 요인:
   25.52 +	</text>
   25.53 +	<text type="string" length="1" name="default_upload_bitrate_text">
   25.54 +		기본 업로드 비트율:
   25.55 +	</text>
   25.56 +	<radio_group name="bitrate">
   25.57 +		<radio_item type="string" length="1" name="32kbps">
   25.58 +			32kbps
   25.59 +		</radio_item>
   25.60 +		<radio_item type="string" length="1" name="64kbps">
   25.61 +			64kbps
   25.62 +		</radio_item>
   25.63 +		<radio_item type="string" length="1" name="96kbps">
   25.64 +			96kbps
   25.65 +		</radio_item>
   25.66 +		<radio_item type="string" length="1" name="128kbps">
   25.67 +			128kbps
   25.68 +		</radio_item>
   25.69 +	</radio_group>
   25.70 +</panel>
    26.1 --- a/indra/newview/skins/default/xui/nl/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,31 +0,0 @@
    26.4 -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    26.5 -<panel label="Audio &amp; video" name="Media panel">
    26.6 -  <text name="muting_text">
    26.7 -    Volume:
    26.8 -  </text>
    26.9 -  <text name="streaming_prefs_text">
   26.10 -Streaming voorkeuren:
   26.11 -</text>
   26.12 -<text name="audio_prefs_text">
   26.13 -Audiovoorkeuren:
   26.14 -  </text>
   26.15 -  <panel name="Volume Panel" />
   26.16 -  <check_box label="Speel streaming muziek indien beschikbaar" name="streaming_music" />
   26.17 -  <check_box label="Speel streaming media indien beschikbaar" name="streaming_video" />
   26.18 -  <check_box label="Automatisch media afspelen" name="auto_streaming_video"
   26.19 -  tool_tip="Als u dit heeft aangevinkt, zal bij het betreden van een nieuw perceel uw media na enkele seconden automatisch beginnen met spelen, zelfs als u tevoren uw media hebt gestopt." />
   26.20 -  <check_box label="Sta scripts toe mijn afspeelknop te bedienen" name="scripted_media"
   26.21 -  tool_tip="Dit inschakelen verhindert scripts ervan om uw media in te schakelen (als het reeds was uitgeschakeld) totdat u zelf op de afspeelknop klikt, of tot het wordt ingeschakeld door automatisch afspelen." />
   26.22 -  <check_box label="Media uitschakelen bij betreden van ander perceel." name="auto_streaming_music"
   26.23 -  tool_tip="Als u een ander perceel betreedt, zal de streaming muziek of spelende media worden uitgeschakeld. Dit duurt totdat het wordt ingeschakeld door automatisch spelen, door een script, of door uw afspeelknop."/>
   26.24 -  <check_box label="Mediafilter (extra beveiliging)" name="media_filter"
   26.25 -  tool_tip="Als u dit inschakelt, zal u de URL worden getoond van alle media die u wordt aangeboden, en laat u de keuze het al dan niet af te spelen. U kunt eventueel ook deze keuze vastleggen voor alle URLs van dat domein."/>
   26.26 -  <button label="Instellingen" name="open_media_lists" width="110"
   26.27 -  tool_tip="Open de instellingen voor het mediafilter."/>
   26.28 -  <check_box label="Audio dempen bij geminimaliseerd venster" name="mute_when_minimized" />
   26.29 -  <slider label="Dopplereffect" name="Doppler Effect" />
   26.30 -  <slider label="Wegdraaifactor" name="Rolloff Factor" />
   26.31 -  <spinner label="L$ wijzigingsdrempel" name="L$ Change Threshold"
   26.32 -  tool_tip="Laat een geluid horen als een bedrag wordt uitgegeven of ontvangen, hoger dan de hier ingestelde waarde." />
   26.33 -  <spinner label="Letseldrempel" name="Health Change Threshold" />
   26.34 -</panel>
    27.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.2 +++ b/indra/newview/skins/default/xui/nl/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    27.3 @@ -0,0 +1,31 @@
    27.4 +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    27.5 +<panel label="Audio &amp; video" name="Media panel">
    27.6 +  <text name="muting_text">
    27.7 +    Volume:
    27.8 +  </text>
    27.9 +  <text name="streaming_prefs_text">
   27.10 +Streaming voorkeuren:
   27.11 +</text>
   27.12 +<text name="audio_prefs_text">
   27.13 +Audiovoorkeuren:
   27.14 +  </text>
   27.15 +  <panel name="Volume Panel" />
   27.16 +  <check_box label="Speel streaming muziek indien beschikbaar" name="streaming_music" />
   27.17 +  <check_box label="Speel streaming media indien beschikbaar" name="streaming_video" />
   27.18 +  <check_box label="Automatisch media afspelen" name="auto_streaming_video"
   27.19 +  tool_tip="Als u dit heeft aangevinkt, zal bij het betreden van een nieuw perceel uw media na enkele seconden automatisch beginnen met spelen, zelfs als u tevoren uw media hebt gestopt." />
   27.20 +  <check_box label="Sta scripts toe mijn afspeelknop te bedienen" name="scripted_media"
   27.21 +  tool_tip="Dit inschakelen verhindert scripts ervan om uw media in te schakelen (als het reeds was uitgeschakeld) totdat u zelf op de afspeelknop klikt, of tot het wordt ingeschakeld door automatisch afspelen." />
   27.22 +  <check_box label="Media uitschakelen bij betreden van ander perceel." name="auto_streaming_music"
   27.23 +  tool_tip="Als u een ander perceel betreedt, zal de streaming muziek of spelende media worden uitgeschakeld. Dit duurt totdat het wordt ingeschakeld door automatisch spelen, door een script, of door uw afspeelknop."/>
   27.24 +  <check_box label="Mediafilter (extra beveiliging)" name="media_filter"
   27.25 +  tool_tip="Als u dit inschakelt, zal u de URL worden getoond van alle media die u wordt aangeboden, en laat u de keuze het al dan niet af te spelen. U kunt eventueel ook deze keuze vastleggen voor alle URLs van dat domein."/>
   27.26 +  <button label="Instellingen" name="open_media_lists" width="110"
   27.27 +  tool_tip="Open de instellingen voor het mediafilter."/>
   27.28 +  <check_box label="Audio dempen bij geminimaliseerd venster" name="mute_when_minimized" />
   27.29 +  <slider label="Dopplereffect" name="Doppler Effect" />
   27.30 +  <slider label="Wegdraaifactor" name="Rolloff Factor" />
   27.31 +  <spinner label="L$ wijzigingsdrempel" name="L$ Change Threshold"
   27.32 +  tool_tip="Laat een geluid horen als een bedrag wordt uitgegeven of ontvangen, hoger dan de hier ingestelde waarde." />
   27.33 +  <spinner label="Letseldrempel" name="Health Change Threshold" />
   27.34 +</panel>
    28.1 --- a/indra/newview/skins/default/xui/pl/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    28.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.3 @@ -1,24 +0,0 @@
    28.4 -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    28.5 -<panel label="Audio i Video" name="Media panel">
    28.6 -	<text type="string" length="1" name="muting_text">
    28.7 -		Głośność:
    28.8 -	</text>
    28.9 -	<text type="string" length="1" name="streaming_prefs_text">
   28.10 -		Ustawienia Strumieni:
   28.11 -	</text>
   28.12 -	<text type="string" length="1" name="audio_prefs_text">
   28.13 -		Ustawienia Audio:
   28.14 -	</text>
   28.15 -	<panel label="Głośność" name="Volume Panel" />
   28.16 -	<check_box label="Odtwarzaj Strumienie Muzyki (zużywa przepustowość)"
   28.17 -	     name="streaming_music" />
   28.18 -	<check_box label="Odtwarzaj Strumienie Video (zużywa przepustowość)"
   28.19 -	     name="streaming_video" />
   28.20 -	<check_box label="Automatycznie Odtwarzaj Media" name="auto_streaming_video" />
   28.21 -	<check_box label="Wyciszaj Audio Podczas Minimalizacji Okna" name="mute_when_minimized" />
   28.22 -	<slider label="Efekt Dopplera" name="Doppler Effect" />
   28.23 -	<slider label="Wpływ Dystansu" name="Distance Factor" />
   28.24 -	<slider label="Wyciszanie" name="Rolloff Factor" />
   28.25 -	<spinner label="Próg Zmiany L$" name="L$ Change Threshold" />
   28.26 -	<spinner label="Próg Zmiany Statusu" name="Health Change Threshold" />
   28.27 -</panel>
    29.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.2 +++ b/indra/newview/skins/default/xui/pl/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    29.3 @@ -0,0 +1,24 @@
    29.4 +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    29.5 +<panel label="Audio i Video" name="Media panel">
    29.6 +	<text type="string" length="1" name="muting_text">
    29.7 +		Głośność:
    29.8 +	</text>
    29.9 +	<text type="string" length="1" name="streaming_prefs_text">
   29.10 +		Ustawienia Strumieni:
   29.11 +	</text>
   29.12 +	<text type="string" length="1" name="audio_prefs_text">
   29.13 +		Ustawienia Audio:
   29.14 +	</text>
   29.15 +	<panel label="Głośność" name="Volume Panel" />
   29.16 +	<check_box label="Odtwarzaj Strumienie Muzyki (zużywa przepustowość)"
   29.17 +	     name="streaming_music" />
   29.18 +	<check_box label="Odtwarzaj Strumienie Video (zużywa przepustowość)"
   29.19 +	     name="streaming_video" />
   29.20 +	<check_box label="Automatycznie Odtwarzaj Media" name="auto_streaming_video" />
   29.21 +	<check_box label="Wyciszaj Audio Podczas Minimalizacji Okna" name="mute_when_minimized" />
   29.22 +	<slider label="Efekt Dopplera" name="Doppler Effect" />
   29.23 +	<slider label="Wpływ Dystansu" name="Distance Factor" />
   29.24 +	<slider label="Wyciszanie" name="Rolloff Factor" />
   29.25 +	<spinner label="Próg Zmiany L$" name="L$ Change Threshold" />
   29.26 +	<spinner label="Próg Zmiany Statusu" name="Health Change Threshold" />
   29.27 +</panel>
    30.1 --- a/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    30.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    30.3 @@ -1,23 +0,0 @@
    30.4 -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
    30.5 -<panel label="Áudio &amp; Vídeo" name="Media panel">
    30.6 -	<text length="1" name="muting_text" type="string">
    30.7 -		Volume:
    30.8 -	</text>
    30.9 -	<text name="streaming_prefs_text">
   30.10 -		Preferências de 
   30.11 -Streaming:
   30.12 -	</text>
   30.13 -	<text name="audio_prefs_text">
   30.14 -		Preferências de Áudio:
   30.15 -	</text>
   30.16 -	<panel label="Volume" name="Volume Panel"/>
   30.17 -	<check_box label="Tocar música em streaming quando disponível (usa mais banda)" name="streaming_music"/>
   30.18 -	<check_box label="Tocar streaming de Mídia quando disponível (usa mais banda)" name="streaming_video"/>
   30.19 -	<check_box label="Tocar mídia automaticamente" name="auto_streaming_video"/>
   30.20 -	<check_box label="Silenciar Áudio quando minimizar janela" name="mute_when_minimized"/>
   30.21 -	<slider label="Efeito Doppler" name="Doppler Effect"/>
   30.22 -	<slider label="Fator Distância" name="Distance Factor"/>
   30.23 -	<slider label="Fator Rolloff" name="Rolloff Factor"/>
   30.24 -	<spinner label="Mudar nível de alerta de L$" name="L$ Change Threshold" label_width="165" width="229"/>
   30.25 -	<spinner label="Mudar nível de alerta de Saúde" name="Health Change Threshold" label_width="165" width="229"/>
   30.26 -</panel>
    31.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    31.2 +++ b/indra/newview/skins/default/xui/pt/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    31.3 @@ -0,0 +1,23 @@
    31.4 +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
    31.5 +<panel label="Áudio &amp; Vídeo" name="Media panel">
    31.6 +	<text length="1" name="muting_text" type="string">
    31.7 +		Volume:
    31.8 +	</text>
    31.9 +	<text name="streaming_prefs_text">
   31.10 +		Preferências de 
   31.11 +Streaming:
   31.12 +	</text>
   31.13 +	<text name="audio_prefs_text">
   31.14 +		Preferências de Áudio:
   31.15 +	</text>
   31.16 +	<panel label="Volume" name="Volume Panel"/>
   31.17 +	<check_box label="Tocar música em streaming quando disponível (usa mais banda)" name="streaming_music"/>
   31.18 +	<check_box label="Tocar streaming de Mídia quando disponível (usa mais banda)" name="streaming_video"/>
   31.19 +	<check_box label="Tocar mídia automaticamente" name="auto_streaming_video"/>
   31.20 +	<check_box label="Silenciar Áudio quando minimizar janela" name="mute_when_minimized"/>
   31.21 +	<slider label="Efeito Doppler" name="Doppler Effect"/>
   31.22 +	<slider label="Fator Distância" name="Distance Factor"/>
   31.23 +	<slider label="Fator Rolloff" name="Rolloff Factor"/>
   31.24 +	<spinner label="Mudar nível de alerta de L$" name="L$ Change Threshold" label_width="165" width="229"/>
   31.25 +	<spinner label="Mudar nível de alerta de Saúde" name="Health Change Threshold" label_width="165" width="229"/>
   31.26 +</panel>
    32.1 --- a/indra/newview/skins/default/xui/ru/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    32.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    32.3 @@ -1,28 +0,0 @@
    32.4 -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    32.5 -<panel label="Аудио и Видео" name="Media panel">
    32.6 -	<text type="string" length="1" name="muting_text">
    32.7 -		Громкость:
    32.8 -	</text>
    32.9 -	<text type="string" length="1" name="streaming_prefs_text">
   32.10 -		Настройки потока:
   32.11 -	</text>
   32.12 -	<text type="string" length="1" name="audio_prefs_text">
   32.13 -		Настройки звука:
   32.14 -	</text>
   32.15 -	<panel label="Громкость" name="Volume Panel" />
   32.16 -	<check_box
   32.17 -	     label="Играть потоковое аудио, если доступно (медленнее)"
   32.18 -	     name="streaming_music" />
   32.19 -	<check_box
   32.20 -	     label="Играть потоковое медиа, если доступно (медленнее)"
   32.21 -	     name="streaming_video" />
   32.22 -	<check_box label="Автоматически играть медиа"
   32.23 -	     name="auto_streaming_video" />
   32.24 -	<check_box label="Отключать звук при сворачивании окна"
   32.25 -	     name="mute_when_minimized" />
   32.26 -	<slider label="Эффект допплера:" name="Doppler Effect" />
   32.27 -	<slider label="Фактор расстояния:" name="Distance Factor" />
   32.28 -	<slider label="Фактор рассеивания:" name="Rolloff Factor" />
   32.29 -	<spinner label="Порог изменения L$" name="L$ Change Threshold" />
   32.30 -	<spinner label="Порог изм. здоровья" name="Health Change Threshold" />
   32.31 -</panel>
    33.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.2 +++ b/indra/newview/skins/default/xui/ru/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    33.3 @@ -0,0 +1,28 @@
    33.4 +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    33.5 +<panel label="Аудио и Видео" name="Media panel">
    33.6 +	<text type="string" length="1" name="muting_text">
    33.7 +		Громкость:
    33.8 +	</text>
    33.9 +	<text type="string" length="1" name="streaming_prefs_text">
   33.10 +		Настройки потока:
   33.11 +	</text>
   33.12 +	<text type="string" length="1" name="audio_prefs_text">
   33.13 +		Настройки звука:
   33.14 +	</text>
   33.15 +	<panel label="Громкость" name="Volume Panel" />
   33.16 +	<check_box
   33.17 +	     label="Играть потоковое аудио, если доступно (медленнее)"
   33.18 +	     name="streaming_music" />
   33.19 +	<check_box
   33.20 +	     label="Играть потоковое медиа, если доступно (медленнее)"
   33.21 +	     name="streaming_video" />
   33.22 +	<check_box label="Автоматически играть медиа"
   33.23 +	     name="auto_streaming_video" />
   33.24 +	<check_box label="Отключать звук при сворачивании окна"
   33.25 +	     name="mute_when_minimized" />
   33.26 +	<slider label="Эффект допплера:" name="Doppler Effect" />
   33.27 +	<slider label="Фактор расстояния:" name="Distance Factor" />
   33.28 +	<slider label="Фактор рассеивания:" name="Rolloff Factor" />
   33.29 +	<spinner label="Порог изменения L$" name="L$ Change Threshold" />
   33.30 +	<spinner label="Порог изм. здоровья" name="Health Change Threshold" />
   33.31 +</panel>
    34.1 --- a/indra/newview/skins/default/xui/tr/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    34.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.3 @@ -1,21 +0,0 @@
    34.4 -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
    34.5 -<panel label="Ses &amp; Görüntü" name="Media panel">
    34.6 -	<text length="1" name="muting_text" type="string">
    34.7 -		Ses seviyesi:
    34.8 -	</text>
    34.9 -	<text length="1" name="streaming_prefs_text" type="string">
   34.10 -		Yayın ayarları:
   34.11 -	</text>
   34.12 -	<text length="1" name="audio_prefs_text" type="string">
   34.13 -		Ses ayarları:
   34.14 -	</text>
   34.15 -	<panel label="Ses birimi" name="Volume Panel"/>
   34.16 -	<check_box label="Var olduğunda müzik yayını başlat(fazla bant genişliği kullanır)" name="streaming_music"/>
   34.17 -	<check_box label="Var olduğunda video yayını başlat(fazla bant genişliği kullanır)" name="streaming_video"/>
   34.18 -	<check_box label="Otomatik olarak medyayı oynat" name="auto_streaming_video"/>
   34.19 -	<check_box label="Pencere küçüldüğünde sesi kapat" name="mute_when_minimized"/>
   34.20 -	<slider label="Işık efekti" name="Doppler Effect"/>
   34.21 -	<slider label="Rolloff faktörü" name="Rolloff Factor"/>
   34.22 -	<spinner label="L$ değişim değeri" name="L$ Change Threshold"/>
   34.23 -	<spinner label="Sağlık değişim değeri" name="Health Change Threshold"/>
   34.24 -</panel>
    35.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    35.2 +++ b/indra/newview/skins/default/xui/tr/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    35.3 @@ -0,0 +1,21 @@
    35.4 +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
    35.5 +<panel label="Ses &amp; Görüntü" name="Media panel">
    35.6 +	<text length="1" name="muting_text" type="string">
    35.7 +		Ses seviyesi:
    35.8 +	</text>
    35.9 +	<text length="1" name="streaming_prefs_text" type="string">
   35.10 +		Yayın ayarları:
   35.11 +	</text>
   35.12 +	<text length="1" name="audio_prefs_text" type="string">
   35.13 +		Ses ayarları:
   35.14 +	</text>
   35.15 +	<panel label="Ses birimi" name="Volume Panel"/>
   35.16 +	<check_box label="Var olduğunda müzik yayını başlat(fazla bant genişliği kullanır)" name="streaming_music"/>
   35.17 +	<check_box label="Var olduğunda video yayını başlat(fazla bant genişliği kullanır)" name="streaming_video"/>
   35.18 +	<check_box label="Otomatik olarak medyayı oynat" name="auto_streaming_video"/>
   35.19 +	<check_box label="Pencere küçüldüğünde sesi kapat" name="mute_when_minimized"/>
   35.20 +	<slider label="Işık efekti" name="Doppler Effect"/>
   35.21 +	<slider label="Rolloff faktörü" name="Rolloff Factor"/>
   35.22 +	<spinner label="L$ değişim değeri" name="L$ Change Threshold"/>
   35.23 +	<spinner label="Sağlık değişim değeri" name="Health Change Threshold"/>
   35.24 +</panel>
    36.1 --- a/indra/newview/skins/default/xui/uk/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    36.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.3 @@ -1,28 +0,0 @@
    36.4 -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    36.5 -<panel label="Аудіо і Відео" name="Media panel">
    36.6 -	<text type="string" length="1" name="muting_text">
    36.7 -		Гучність:
    36.8 -	</text>
    36.9 -	<text type="string" length="1" name="streaming_prefs_text">
   36.10 -		Настройки потоку:
   36.11 -	</text>
   36.12 -	<text type="string" length="1" name="audio_prefs_text">
   36.13 -		Настройки звуку:
   36.14 -	</text>
   36.15 -	<panel label="Гучність" name="Volume Panel" />
   36.16 -	<check_box
   36.17 -	     label="Грати потокове аудіо, якщо доступно (повільніше)"
   36.18 -	     name="streaming_music" />
   36.19 -	<check_box
   36.20 -	     label="Грати потокове медіа, якщо доступно (повільніше)"
   36.21 -	     name="streaming_video" />
   36.22 -	<check_box label="Автоматично грати медіа"
   36.23 -	     name="auto_streaming_video" />
   36.24 -	<check_box label="Вимикати звук при звертанні вікна"
   36.25 -	     name="mute_when_minimized" />
   36.26 -	<slider label="Ефект доплера:" name="Doppler Effect" />
   36.27 -	<slider label="Фактор відстані:" name="Distance Factor" />
   36.28 -	<slider label="Фактор розсіювання:" name="Rolloff Factor" />
   36.29 -	<spinner label="Поріг зміни L$" name="L$ Change Threshold" />
   36.30 -	<spinner label="Поріг зм. здоров&apos;я" name="Health Change Threshold" />
   36.31 -</panel>
    37.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    37.2 +++ b/indra/newview/skins/default/xui/uk/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    37.3 @@ -0,0 +1,28 @@
    37.4 +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
    37.5 +<panel label="Аудіо і Відео" name="Media panel">
    37.6 +	<text type="string" length="1" name="muting_text">
    37.7 +		Гучність:
    37.8 +	</text>
    37.9 +	<text type="string" length="1" name="streaming_prefs_text">
   37.10 +		Настройки потоку:
   37.11 +	</text>
   37.12 +	<text type="string" length="1" name="audio_prefs_text">
   37.13 +		Настройки звуку:
   37.14 +	</text>
   37.15 +	<panel label="Гучність" name="Volume Panel" />
   37.16 +	<check_box
   37.17 +	     label="Грати потокове аудіо, якщо доступно (повільніше)"
   37.18 +	     name="streaming_music" />
   37.19 +	<check_box
   37.20 +	     label="Грати потокове медіа, якщо доступно (повільніше)"
   37.21 +	     name="streaming_video" />
   37.22 +	<check_box label="Автоматично грати медіа"
   37.23 +	     name="auto_streaming_video" />
   37.24 +	<check_box label="Вимикати звук при звертанні вікна"
   37.25 +	     name="mute_when_minimized" />
   37.26 +	<slider label="Ефект доплера:" name="Doppler Effect" />
   37.27 +	<slider label="Фактор відстані:" name="Distance Factor" />
   37.28 +	<slider label="Фактор розсіювання:" name="Rolloff Factor" />
   37.29 +	<spinner label="Поріг зміни L$" name="L$ Change Threshold" />
   37.30 +	<spinner label="Поріг зм. здоров&apos;я" name="Health Change Threshold" />
   37.31 +</panel>
    38.1 --- a/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml	Tue Dec 27 12:39:25 2011 +0100
    38.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    38.3 @@ -1,22 +0,0 @@
    38.4 -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
    38.5 -<panel label="音频和视频" name="Media panel">
    38.6 -	<text length="1" name="muting_text" type="string">
    38.7 -		音量:
    38.8 -	</text>
    38.9 -	<text name="streaming_prefs_text">
   38.10 -		流媒体首选项:
   38.11 -	</text>
   38.12 -	<text name="audio_prefs_text">
   38.13 -		音频首选项:
   38.14 -	</text>
   38.15 -	<panel label="音量" name="Volume Panel"/>
   38.16 -	<check_box label="当音乐可用时播放音乐流(会占用更多带宽)" name="streaming_music"/>
   38.17 -	<check_box label="当视频可用时播放视频流(会占用更多带宽)" name="streaming_video"/>
   38.18 -	<check_box label="自动播放媒体" name="auto_streaming_video"/>
   38.19 -	<check_box label="当窗口最小化时屏蔽声音" name="mute_when_minimized"/>
   38.20 -	<slider label="多普勒效应" name="Doppler Effect" width="250"/>
   38.21 -	<slider label="距离系数" name="Distance Factor"/>
   38.22 -	<slider label="衰减系数:" name="Rolloff Factor"/>
   38.23 -	<spinner label="L$ 变化阈值" name="L$ Change Threshold"/>
   38.24 -	<spinner label="生命值变化阈值" name="Health Change Threshold"/>
   38.25 -</panel>
    39.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    39.2 +++ b/indra/newview/skins/default/xui/zh/panel_preferences_media.xml	Tue Dec 27 12:40:48 2011 +0100
    39.3 @@ -0,0 +1,22 @@
    39.4 +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
    39.5 +<panel label="音频和视频" name="Media panel">
    39.6 +	<text length="1" name="muting_text" type="string">
    39.7 +		音量:
    39.8 +	</text>
    39.9 +	<text name="streaming_prefs_text">
   39.10 +		流媒体首选项:
   39.11 +	</text>
   39.12 +	<text name="audio_prefs_text">
   39.13 +		音频首选项:
   39.14 +	</text>
   39.15 +	<panel label="音量" name="Volume Panel"/>
   39.16 +	<check_box label="当音乐可用时播放音乐流(会占用更多带宽)" name="streaming_music"/>
   39.17 +	<check_box label="当视频可用时播放视频流(会占用更多带宽)" name="streaming_video"/>
   39.18 +	<check_box label="自动播放媒体" name="auto_streaming_video"/>
   39.19 +	<check_box label="当窗口最小化时屏蔽声音" name="mute_when_minimized"/>
   39.20 +	<slider label="多普勒效应" name="Doppler Effect" width="250"/>
   39.21 +	<slider label="距离系数" name="Distance Factor"/>
   39.22 +	<slider label="衰减系数:" name="Rolloff Factor"/>
   39.23 +	<spinner label="L$ 变化阈值" name="L$ Change Threshold"/>
   39.24 +	<spinner label="生命值变化阈值" name="Health Change Threshold"/>
   39.25 +</panel>

mercurial