diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 3b81192f9..5cd4c780e 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -2023,13 +2023,21 @@ LLVector3 LLAgentCamera::getCameraOffsetInitial()
 }
 
 // Adds change to vector CachedControl, vec, at idx
-template <typename T, typename Vec>
+template <typename Vec, typename T>
 void change_vec(const T& change, LLCachedControl<Vec>& vec, const U32& idx = VZ)
 {
 	Vec changed(vec);
 	changed[idx] += change;
 	vec = changed;
 }
+// Same as above, but for ControlVariables
+template <typename Vec, typename T>
+void change_vec(const T& change, LLPointer<LLControlVariable>& vec, const U32& idx = VZ)
+{
+	Vec changed(vec->get());
+	changed[idx] += change;
+	vec->set(changed.getValue());
+}
 
 //-----------------------------------------------------------------------------
 // handleScrollWheel()
@@ -2072,13 +2080,11 @@ void LLAgentCamera::handleScrollWheel(S32 clicks)
 					const F32 change(static_cast<F32>(clicks) * 0.1f);
 					if (mask & MASK_SHIFT)
 					{
-						static LLCachedControl<LLVector3d> focus_offset("FocusOffsetRearView");
-						change_vec(change, focus_offset);
+						change_vec<LLVector3d>(change, mFocusOffsetInitial[mCameraPreset]);
 					}
 					if (mask & MASK_CONTROL)
 					{
-						static LLCachedControl<LLVector3> camera_offset("CameraOffsetRearView");
-						change_vec(change, camera_offset);
+						change_vec<LLVector3>(change, mCameraOffsetInitial[mCameraPreset]);
 					}
 					return;
 				}
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index 0651458c7..3f755dbf2 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -824,7 +824,7 @@ BOOL LLToolCompGun::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	}
 	else mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV();
 
-	mTargetFOV = gSavedPerAccountSettings.getF32("zmm_mlfov");
+	mTargetFOV = gSavedSettings.getF32("zmm_mlfov");
 	mTimerFOV.start();
 
 	return TRUE;
@@ -836,7 +836,7 @@ BOOL LLToolCompGun::handleScrollWheel(S32 x, S32 y, S32 clicks)
 	{
 		mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV();
 
-		gSavedPerAccountSettings.setF32(
+		gSavedSettings.setF32(
 			"zmm_mlfov",
 			mTargetFOV = clicks > 0 ?
 				llclamp(mTargetFOV += (0.05f * clicks), 0.1f, 3.0f) :
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index dcb7a4eb7..e32525a9d 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -189,6 +189,7 @@
 #include "llvovolume.h"
 
 #include "hippogridmanager.h"
+#include "wlfPanel_AdvSettings.h"
 
 void toggle_search_floater();
 
@@ -4122,6 +4123,16 @@ void reset_view_final( BOOL proceed )
 	}
 
 	gAgentCamera.switchCameraPreset(CAMERA_PRESET_REAR_VIEW);
+	if (wlfPanel_AdvSettings::instanceExists()) // Fix up the buttons on the wlf panel to match the preset switch
+	{
+		wlfPanel_AdvSettings& inst(wlfPanel_AdvSettings::instance());
+		if (inst.isExpanded())
+		{
+			inst.getChildView("Rear")->setValue(true);
+			inst.getChildView("Front")->setValue(false);
+			inst.getChildView("Group")->setValue(false);
+		}
+	}
 	gAgentCamera.resetView(TRUE, TRUE);
 	gAgentCamera.setLookAt(LOOKAT_TARGET_CLEAR);
 
diff --git a/indra/newview/skins/default/textures/Cam_Preset_Back_Off.png b/indra/newview/skins/default/textures/Cam_Preset_Back_Off.png
new file mode 100644
index 000000000..00158a7bc
Binary files /dev/null and b/indra/newview/skins/default/textures/Cam_Preset_Back_Off.png differ
diff --git a/indra/newview/skins/default/textures/Cam_Preset_Back_On.png b/indra/newview/skins/default/textures/Cam_Preset_Back_On.png
new file mode 100644
index 000000000..3748f5e19
Binary files /dev/null and b/indra/newview/skins/default/textures/Cam_Preset_Back_On.png differ
diff --git a/indra/newview/skins/default/textures/Cam_Preset_Front_Off.png b/indra/newview/skins/default/textures/Cam_Preset_Front_Off.png
new file mode 100644
index 000000000..c49b8f9a2
Binary files /dev/null and b/indra/newview/skins/default/textures/Cam_Preset_Front_Off.png differ
diff --git a/indra/newview/skins/default/textures/Cam_Preset_Front_On.png b/indra/newview/skins/default/textures/Cam_Preset_Front_On.png
new file mode 100644
index 000000000..bc8c4db04
Binary files /dev/null and b/indra/newview/skins/default/textures/Cam_Preset_Front_On.png differ
diff --git a/indra/newview/skins/default/textures/Cam_Preset_Side_Off.png b/indra/newview/skins/default/textures/Cam_Preset_Side_Off.png
new file mode 100644
index 000000000..b919a0a15
Binary files /dev/null and b/indra/newview/skins/default/textures/Cam_Preset_Side_Off.png differ
diff --git a/indra/newview/skins/default/textures/Cam_Preset_Side_On.png b/indra/newview/skins/default/textures/Cam_Preset_Side_On.png
new file mode 100644
index 000000000..de9da359a
Binary files /dev/null and b/indra/newview/skins/default/textures/Cam_Preset_Side_On.png differ
diff --git a/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml b/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
index 2cc0df053..d4ee3c863 100644
--- a/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
+++ b/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
@@ -1,18 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" height="180" name="Adv_Settings" use_bounding_rect="true" width="220">
-	<panel bottom="1" filename="panel_bg_tab.xml" height="177" width="197"/>
-	<slider bottom="157" left="5" control_name="RenderFarClip" decimal_digits="0" height="20" increment="8" label="Draw Dist.:" can_edit_text="true" label_width="60" max_val="1024" min_val="24" val_width="36" name="DrawDistance" width="189" tool_tip="Change your Draw Distance"/>
-	<slider bottom_delta="-20" control_name="RenderMaxPartCount" decimal_digits="0" height="20" increment="256" label="Particles:" can_edit_text="true" label_width="60" max_val="8192" min_val="0" val_width="36" name="MaxParticleCount" width="189" tool_tip="Amount of particles to render"/>
-	<slider bottom_delta="-20" control_name="RenderAvatarMaxVisible" decimal_digits="0" height="20" increment="1" label="Max Avs:" can_edit_text="true" label_width="60" max_val="50" min_val="1" val_width="36" name="RenderAvatarMaxVisible" width="189" tool_tip="How many avatars to fully render on screen. Lowering this greatly improves FPS in crowded situations. Requires Avatar Impostors to be on. [Default 35]"/>
-	<slider bottom_delta="-20" control_name="RenderVolumeLODFactor" height="20" increment="0.125" label="Obj. Detail:" can_edit_text="true" label_width="60"  max_val="4" min_val="0.5" name="Object Detail" val_width="36" width="189" tool_tip="Controls level of detail of primitives (multiplier for current screen area when calculated level of detail[0.5 to 2.0 is stable])"/>
-	<button left="5" height="20" name="EnvAdvancedSkyButton" width="20" image_overlay="Inv_WindLight.png" label="" tool_tip="Advanced Sky"/>
-	<combo_box name="WLSkyPresetsCombo" bottom_delta="1" left_delta="20" height="18" width="133" tool_tip="WindLight Presets for your Sky."/>
-	<button bottom_delta="0" height="18" label="&lt;" left="158" image_overlay="arrow_left.tga" name="WLprev" scale_image="true" width="18"/>
-	<button bottom_delta="0" height="18" label="&gt;" left_delta="18" image_overlay="arrow_right.tga" name="WLnext" width="18"/>
+	<panel bottom="1" filename="panel_bg_tab.xml" height="194" width="197"/>
+	<text bottom="169" left="5" height="20" width="190" name="Camera Preset:">Cam Preset:</text>
+	<button bottom="171" left="81" width="20" height="20" label="" toggle="true" image_selected="Cam_Preset_Back_On.png" image_unselected="Cam_Preset_Back_Off.png" name="Rear">
+		<button.commit_callback function="Wlf.ChangeCameraPreset" parameter="0"/>
+	</button>
+	<button bottom_delta="0" left_delta="20" width="20" height="20" label="" toggle="true" image_selected="Cam_Preset_Front_On.png" image_unselected="Cam_Preset_Front_Off.png" name="Front">
+		<button.commit_callback function="Wlf.ChangeCameraPreset" parameter="1"/>
+	</button>
+	<button bottom_delta="0" left_delta="20" width="20" height="20" label="" toggle="true" image_selected="Cam_Preset_Side_On.png" image_unselected="Cam_Preset_Side_Off.png" name="Group">
+		<button.commit_callback function="Wlf.ChangeCameraPreset" parameter="2"/>
+	</button>
+	<slider bottom_delta="-20" left="5" control_name="RenderFarClip" decimal_digits="0" height="20" increment="8" label="Draw Dist.:" can_edit_text="true" label_width="60" max_val="1024" min_val="24" val_width="36" name="DrawDistance" width="190" tool_tip="Change your Draw Distance"/>
+	<slider bottom_delta="-20" control_name="RenderMaxPartCount" decimal_digits="0" height="20" increment="256" label="Particles:" can_edit_text="true" label_width="60" max_val="8192" min_val="0" val_width="36" name="MaxParticleCount" width="190" tool_tip="Amount of particles to render"/>
+	<slider bottom_delta="-20" control_name="RenderAvatarMaxVisible" decimal_digits="0" height="20" increment="1" label="Max Avs:" can_edit_text="true" label_width="60" max_val="50" min_val="1" val_width="36" name="RenderAvatarMaxVisible" width="190" tool_tip="How many avatars to fully render on screen. Lowering this greatly improves FPS in crowded situations. Requires Avatar Impostors to be on. [Default 35]"/>
+	<slider bottom_delta="-20" control_name="RenderVolumeLODFactor" height="20" increment="0.125" label="Obj. Detail:" can_edit_text="true" label_width="60"  max_val="4" min_val="0.5" name="Object Detail" val_width="36" width="190" tool_tip="Controls level of detail of primitives (multiplier for current screen area when calculated level of detail[0.5 to 2.0 is stable])"/>
+	<button bottom_delta="-22" left="5" height="20" name="EnvAdvancedSkyButton" width="20" image_overlay="Inv_WindLight.png" label="" tool_tip="Advanced Sky"/>
+	<combo_box name="WLSkyPresetsCombo" bottom_delta="1" left_delta="20" height="18" width="131" tool_tip="WindLight Presets for your Sky."/>
+	<button bottom_delta="-1" height="19" label="&lt;" left="157" image_overlay="arrow_left.tga" name="WLprev" scale_image="true" width="19"/>
+	<button bottom_delta="0" height="19" label="&gt;" left_delta="18" image_overlay="arrow_right.tga" name="WLnext" width="19"/>
 	<button left="5" height="20" name="EnvAdvancedWaterButton" width="20" image_overlay="Inv_WaterLight.png" label="" tool_tip="Advanced Water"/>
-	<combo_box name="WLWaterPresetsCombo" bottom_delta="1" left_delta="20" height="18" width="133" tool_tip="WindLight Presets for your Water."/>
-	<button bottom_delta="0" height="18" label="&lt;" left="158" image_overlay="arrow_left.tga" name="WWprev" width="18"/>
-	<button bottom_delta="0" height="18" label="&gt;" left_delta="18" image_overlay="arrow_right.tga" name="WWnext" width="18"/>
+	<combo_box name="WLWaterPresetsCombo" bottom_delta="1" left_delta="20" height="18" width="131" tool_tip="WindLight Presets for your Water."/>
+	<button bottom_delta="-1" height="19" label="&lt;" left="157" image_overlay="arrow_left.tga" name="WWprev" width="19"/>
+	<button bottom_delta="0" height="19" label="&gt;" left_delta="18" image_overlay="arrow_right.tga" name="WWnext" width="19"/>
 	<check_box left="5" label="Region WL" control_name="UseEnvironmentFromRegion" height="16" name="use_estate_wl" tool_tip="Use the region's windlight settings when available."/>
 <!--check_box bottom_delta="0" left_delta="125" label="Always?" control_name="UseEnvironmentFromRegionAlways" height="16" name="Always" tool_tip="Always use region/parcel settings when they exist, automatically."/-->
 	<check_box bottom_delta="0" left_delta="110" label="Crossfade?" control_name="PhoenixInterpolateSky" height="16" name="Crossfade" tool_tip="If unchecked, Sky Windlight settings changes will apply immediately, without hesitation/animation."/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
index fe2713675..41c80ba67 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
@@ -37,11 +37,13 @@
     <panel label="Chat UI" name="ChatUI">
       <check_box label="IMs Verticaux (Déco Reco)" name="use_vertical_ims_check"/>
       <check_box label="Ouvre les nouveaux IMs séparements" name="chats_torn_off"/>
+      <check_box label="Signale les nouveaux IM entrants" name="chat_steal_focus"/>
       <check_box label="Montre la barre du chat local séparée (Déco Reco)" tool_tip="" name="show_local_chat_floater_bar"/>
       <check_box label="boutons horizontaux pour les contacts (Déco Reco)" tool_tip="Activé, les boutons amis/groupes seront en bas et horizontaux et non plus verticaux et à droite." name="horiz_butt"/>
       <check_box label="Boutons sur la même ligne que les noms pour les IMs" name="im_concise_butt"/>
       <check_box label="Boutons sur la ligne des noms des chats de groupe" name="group_concise_butt"/>
       <check_box label="Boutons sur la ligne de titre des conférences" name="conf_concise_butt"/>
+      <check_box label="Ouvre les logs avec un éditeur de texte externe (windows)" name="legacy_log_launch"/>
       <check_box label="Désactive le raccourci ouvrant détacher la liste d'amis" name="only_comm"/>
       <check_box label="Ecrit en Italiques le /me" name="italicize_actions"/>
     </panel>
@@ -91,6 +93,10 @@ Et aussi : #n Pour le nom classique, #d Pour le Display, #r Pour la SLURL de vô
       <check_box label="Scripts" name="Scripts"/>
       <check_box label="Offres de TP" name="Teleport Offers"/>
       <check_box label="Notices de groupes" name="Group Notices"/>
+      <check_box label="Demande de TP" name="Teleport Requests"/>
+      <text name="Except those from:">Excepté ceux venant de :</text>
+      <check_box label="Mes objets" name="My objects"/>
+      <check_box label="Mes amis" name="My friends"/>
       <check_box label="Active les sons des gestures" name="Enable Gesture Sounds"/>
     </panel>
 
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index e5b200812..6b5e1ab5c 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -15,6 +15,7 @@
 		<combo_item name="Display Names (with Username)">Display Names(w/Username)</combo_item>
 		<combo_item name="Display Names only">Display Names only</combo_item>
 	</combo_box>
+	<check_box label="Afficher Resident" name="show_resident_checkbox"/>
 	<check_box label="Nom des avatars en petit" name="small_avatar_names_checkbox"/>
 	<check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox"/>
 	<text name="group_titles_textbox">Titres de groupe :</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml b/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
index 57a39dc88..16a485bae 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
@@ -2,9 +2,11 @@
 <panel name="chat">
 	<text name="voice_unavailable">Le chat vocal n'est pas disponible</text>
 	<check_box label="Activer la voix" name="enable_voice_check"/>
+	<string value="Permet de connecter en même temps plusieurs sessions en voice simultanée (déco reco)" name="multivoice_label"/>
 	<radio_group name="ear_location">
 		<radio_item name="0">Ecouter depuis la position de la caméra</radio_item>
 		<radio_item name="1">Ecouter depuis la position de l'avatar</radio_item>
+		<radio_item name="3">Entendre la voice de maniere égale pour tout le monde.</radio_item>
 	</radio_group>
 	<text name="push_to_talk_heading">Appuyer pour parler</text>
 	<check_box label="Utiliser &#x22;Appuyer pour Parler&#x22; en mode bascule" name="push_to_talk_toggle_check" tool_tip="Ce mode vous permet de contrôler l'ouverture du micro en mode bascule. Cliquez sur la touche de contrôle ou le bouton &#x22;Parler&#x22; pour ouvrir et fermer le micro. Si vous n'êtes pas en mode bascule, le micro n'est ouvert que si vous cliquez et maintenez enfoncés la touche de contrôle ou appuyez sur le bouton &#x22;Parler&#x22;."/>
diff --git a/indra/newview/wlfPanel_AdvSettings.cpp b/indra/newview/wlfPanel_AdvSettings.cpp
index 18613c496..9ed6ea18e 100644
--- a/indra/newview/wlfPanel_AdvSettings.cpp
+++ b/indra/newview/wlfPanel_AdvSettings.cpp
@@ -47,6 +47,7 @@
 #include "llfloaterwindlight.h"
 #include "llfloaterwater.h"
 
+#include "llagentcamera.h"
 #include "lldaycyclemanager.h"
 #include "llenvmanager.h"
 #include "llwaterparammanager.h"
@@ -58,6 +59,7 @@ wlfPanel_AdvSettings::wlfPanel_AdvSettings() : mExpanded(false)
 	setVisible(false);
 	setIsChrome(TRUE);
 	setFocusRoot(TRUE);
+	mCommitCallbackRegistrar.add("Wlf.ChangeCameraPreset", boost::bind(&wlfPanel_AdvSettings::onChangeCameraPreset, this, _1, _2));
 	if(rlv_handler_t::isEnabled())
 		gRlvHandler.setBehaviourToggleCallback(boost::bind(&wlfPanel_AdvSettings::onRlvBehaviorChange, this, _1, _2));
 }
@@ -184,6 +186,14 @@ BOOL wlfPanel_AdvSettings::postBuild()
 		mTimeSlider->setCommitCallback(boost::bind(&wlfPanel_AdvSettings::onChangeDayTime, this, _2));
 		updateTimeSlider();
 		updateRlvVisibility();
+
+		const U32 preset(gSavedSettings.getU32("CameraPreset"));
+		if (preset == CAMERA_PRESET_REAR_VIEW)
+			getChildView("Rear")->setValue(true);
+		else if (preset == CAMERA_PRESET_FRONT_VIEW)
+			getChildView("Front")->setValue(true);
+		else if (preset == CAMERA_PRESET_GROUP_VIEW)
+			getChildView("Group")->setValue(true);
 	}
 	return TRUE;
 }
@@ -203,6 +213,24 @@ void wlfPanel_AdvSettings::onClickExpandBtn(void* user_data)
 	gSavedSettings.setBOOL("wlfAdvSettingsPopup",!gSavedSettings.getBOOL("wlfAdvSettingsPopup"));
 }
 
+void wlfPanel_AdvSettings::onChangeCameraPreset(LLUICtrl* ctrl, const LLSD& param)
+{
+	if (!ctrl->getValue()) // One of these must be set at all times
+	{
+		ctrl->setValue(true);
+		return;
+	}
+
+	// 0 is rear, 1 is front, 2 is group
+	const ECameraPreset preset((param.asInteger() == 0) ? CAMERA_PRESET_REAR_VIEW : (param.asInteger() == 1) ? CAMERA_PRESET_FRONT_VIEW : CAMERA_PRESET_GROUP_VIEW);
+	// Turn off the other preset indicators
+	if (preset != CAMERA_PRESET_REAR_VIEW) getChildView("Rear")->setValue(false);
+	if (preset != CAMERA_PRESET_FRONT_VIEW) getChildView("Front")->setValue(false);
+	if (preset != CAMERA_PRESET_GROUP_VIEW) getChildView("Group")->setValue(false);
+	// Actually switch the camera
+	gAgentCamera.switchCameraPreset(preset);
+}
+
 void wlfPanel_AdvSettings::onUseRegionSettings(const LLSD& value)
 {
 	LLEnvManagerNew::instance().setUseRegionSettings(value.asBoolean(), gSavedSettings.getBOOL("PhoenixInterpolateSky"));
diff --git a/indra/newview/wlfPanel_AdvSettings.h b/indra/newview/wlfPanel_AdvSettings.h
index ea7c65d01..413b30cd6 100644
--- a/indra/newview/wlfPanel_AdvSettings.h
+++ b/indra/newview/wlfPanel_AdvSettings.h
@@ -57,8 +57,10 @@ public:
 	static void updateClass();
 
 	static void onClickExpandBtn(void* user_data);
+	void onChangeCameraPreset(LLUICtrl* ctrl, const LLSD& param);
 	void onChangeWWPresetName(const LLSD& value);
 	void onChangeWLPresetName(const LLSD& value);
+	const bool& isExpanded() const { return mExpanded; }
 
 protected:
 	void build();