diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 4a65879f8..08989e628 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2490,6 +2490,10 @@ BOOL LLTextEditor::handleSpecialKey(const KEY key, const MASK mask, BOOL* return
 		{
 			removeWord(false);
 		}
+		else
+		{
+			handled = false;
+		}
 		break;
 
 	case KEY_RETURN:
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 54f0eef85..4b4a622d3 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -717,7 +717,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <boolean>0</boolean>
+      <boolean>1</boolean>
     </map>
     <key>LiruLegacyOutfitStoreObjChanges</key>
     <map>
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index 6d2a2ae3e..a8f27731b 100644
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -43,6 +43,7 @@
 LLFloaterWebContent::_Params::_Params()
 :	url("url"),
 	target("target"),
+	initial_mime_type("initial_mime_type", "text/html"),
 	id("id"),
 	window_class("window_class", "web_content"),
 	show_chrome("show_chrome", true),
@@ -283,9 +284,9 @@ void LLFloaterWebContent::open_media(const Params& p)
 {
 	// Specifying a mime type of text/html here causes the plugin system to skip the MIME type probe and just open a browser plugin.
 	LLViewerMedia::proxyWindowOpened(p.target(), p.id());
-	mWebBrowser->setHomePageUrl(p.url, "text/html");
+	mWebBrowser->setHomePageUrl(p.url, p.initial_mime_type);
 	mWebBrowser->setTarget(p.target);
-	mWebBrowser->navigateTo(p.url, "text/html");
+	mWebBrowser->navigateTo(p.url, p.initial_mime_type);
 	
 	set_current_url(p.url);
 
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h
index 9fabe42ac..8dbca1d24 100644
--- a/indra/newview/llfloaterwebcontent.h
+++ b/indra/newview/llfloaterwebcontent.h
@@ -50,6 +50,7 @@ public:
 	{
 		Optional<std::string>	url,
 								target,
+								initial_mime_type,
 								window_class,
 								id;
 		Optional<bool>			show_chrome,
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index ed0fff564..efdafd28e 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -487,8 +487,8 @@ BOOL LLFloaterIMPanel::postBuild()
 		if (LLUICtrl* ctrl = findChild<LLUICtrl>("history_btn"))
 			ctrl->setCommitCallback(boost::bind(&LLFloaterIMPanel::onClickHistory, this));
 
-		getChild<LLButton>("start_call_btn")->setCommitCallback(boost::bind(&LLIMMgr::startCall, gIMMgr, mSessionUUID, LLVoiceChannel::OUTGOING_CALL));
-		getChild<LLButton>("end_call_btn")->setCommitCallback(boost::bind(&LLIMMgr::endCall, gIMMgr, mSessionUUID));
+		getChild<LLButton>("start_call_btn")->setCommitCallback(boost::bind(&LLIMMgr::startCall, gIMMgr, boost::ref(mSessionUUID), LLVoiceChannel::OUTGOING_CALL));
+		getChild<LLButton>("end_call_btn")->setCommitCallback(boost::bind(&LLIMMgr::endCall, gIMMgr, boost::ref(mSessionUUID)));
 		getChild<LLButton>("send_btn")->setCommitCallback(boost::bind(&LLFloaterIMPanel::onSendMsg,this));
 		if (LLButton* btn = findChild<LLButton>("toggle_active_speakers_btn"))
 			btn->setCommitCallback(boost::bind(&LLFloaterIMPanel::onClickToggleActiveSpeakers, this, _2));
@@ -506,7 +506,7 @@ BOOL LLFloaterIMPanel::postBuild()
 			mSpeakerPanel->refreshSpeakers();
 		}
 
-		if (mDialog == IM_NOTHING_SPECIAL)
+		if (mSessionType == P2P_SESSION)
 		{
 			getChild<LLUICtrl>("mute_btn")->setCommitCallback(boost::bind(&LLFloaterIMPanel::onClickMuteVoice, this));
 			getChild<LLUICtrl>("speaker_volume")->setCommitCallback(boost::bind(&LLVoiceClient::setUserVolume, LLVoiceClient::getInstance(), mOtherParticipantUUID, _2));
@@ -995,11 +995,13 @@ void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value)
 
 void show_log_browser(const std::string& name, const std::string& id)
 {
+#if LL_WINDOWS // Singu TODO: Other platforms?
 	if (gSavedSettings.getBOOL("LiruLegacyLogLaunch"))
 	{
 		gViewerWindow->getWindow()->ShellEx("\"" + LLLogChat::makeLogFileName(name) + "\"");
 		return;
 	}
+#endif
 	LLFloaterWebContent::Params p;
 	p.url("file:///" + LLLogChat::makeLogFileName(name));
 	p.id(id);
@@ -1143,7 +1145,7 @@ bool convert_roleplay_text(std::string& text); // Returns true if text is an act
 void LLFloaterIMPanel::onSendMsg()
 {
 	if (!gAgent.isGodlike() 
-		&& (mDialog == IM_NOTHING_SPECIAL)
+		&& (mSessionType == P2P_SESSION)
 		&& mOtherParticipantUUID.isNull())
 	{
 		llinfos << "Cannot send IM to everyone unless you're a god." << llendl;
@@ -1256,7 +1258,7 @@ void LLFloaterIMPanel::onSendMsg()
 				}
 
 				// local echo
-				if((mDialog == IM_NOTHING_SPECIAL) && 
+				if((mSessionType == P2P_SESSION) &&
 				   (mOtherParticipantUUID.notNull()))
 				{
 					std::string name;
@@ -1388,7 +1390,7 @@ void LLFloaterIMPanel::sendTypingState(bool typing)
 		return;
 	// Don't want to send typing indicators to multiple people, potentially too
 	// much network traffic.  Only send in person-to-person IMs.
-	if (mDialog != IM_NOTHING_SPECIAL) return;
+	if (mSessionType == P2P_SESSION) return;
 
 	std::string name;
 	gAgent.buildFullname(name);
diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index cc86cd35f..e136cbc1f 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -946,7 +946,7 @@
 			<menu_item_call bottom="-94" enabled="true" height="19" label="Singularity Issue Tracker..."
 			     left="0" mouse_opaque="true" name="Singularity Issue Tracker..." width="166">
 				<on_click function="PromptShowURL" name="SinguIssueTracker_url"
-						userdata="WebLaunchSinguIssue,http://code.google.com/p/singularity-viewer/issues/list" />
+						userdata="WebLaunchSinguIssue,http://links.singularityviewer.org/?to=issues" />
 			</menu_item_call>
 			<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
 			     mouse_opaque="true" name="separator7" width="250" />
diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
deleted file mode 100644
index 3559ec984..000000000
--- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="Navigateur">
-	<layout_stack name="stack1">
-		<layout_panel name="nav_controls">
-			<button label="Précédente" name="back" width="75"/>
-			<button label="Suivante" left_delta="75" name="forward" width="70"/>
-			<button label="Rafraîchir" left_delta="75" name="reload"/>
-			<combo_box left_delta="75" name="address" width="510"/>
-			<button label="OK" left_delta="515" name="go"/>
-		</layout_panel>
-		<layout_panel name="parcel_owner_controls">
-			<button label="Envoyer l'URL sur la parcelle" name="assign"/>
-		</layout_panel>
-		<layout_panel name="external_controls">
-			<button label="Ouvrir dans mon navigateur web" name="open_browser" width="196"/>
-			<check_box label="Toujours ouvrir dans mon navigateur web" left_delta="201" name="open_always"/>
-			<button label="Fermer" name="close"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index fa8aaf62e..dafb4ff07 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -531,33 +531,6 @@
 					Tissage
 				</combo_item>
 			</combo_box>
-			<text name="tex scale">
-				Répétitions par face
-			</text>
-			<check_box label="Inverser" name="checkbox flip s"/>
-			<check_box label="Inverser" name="checkbox flip t"/>
-			<text name="tex rotate">
-				Rotation (degrés)
-			</text>
-			<spinner left="122" name="TexRot" width="58"/>
-			<string name="string repeats per meter">
-				Répétitions au mètre
-			</string>
-			<string name="string repeats per face">
-				Répétitions par face
-			</string>
-			<text name="rpt" width="160">
-				Répétitions au mètre
-			</text>
-			<spinner left="122" name="rptctrl" width="58"/>
-			<button label="Appliquer" label_selected="Appliquer" left_delta="68" name="button apply" width="75"/>
-			<text name="tex offset">
-				Décalage
-			</text>
-			<button label="Ajuster" label_selected="Ajuster" left="140" name="button align" width="45"/>
-			<text name="textbox params">Paramètres</text>
-			<button label="Copier" name="copytextures" tool_tip="Copie les paramètres de la texture dans le presse papier"  width="55"/>
-			<button label="Coller" name="pastetextures" tool_tip="Colle les paramètres de la texture du presse papier"  width="55"/>
 		</panel>
 		<panel label="Contenu" name="Contents">
 			<button label="Nouveau script" label_selected="Nouveau script" name="button new script"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index 7206bef11..343163450 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -41,7 +41,7 @@
 	<check_box label="Lumi&#xE8;re locales" name="LightingDetailRadio"/>
 	<check_box label="Effets de base" name="BasicShaders" tool_tip="D&#xE9;sactiver cette option peut emp&#xEA;cher certains drivers de cartes graphiques de planter."/>
 	<check_box label="Effets atmosph&#xE9;riques" name="WindLightUseAtmosShaders"/>
-	<check_box label="D&#xE9;lissage" name="RenderDeferred" width="256" />
+	<check_box label="Modèle d'éclairage avancé (materials)" name="RenderDeferred" width="256" />
 	<check_box label="Occlusion ambiante" name="UseSSAO"/>
 	<check_box label="Profondeur de champ" name="RenderDepthOfField"/>
 	<check_box label="Illumination globale (Experimental)" name="RenderDeferredGI" width="256"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
new file mode 100644
index 000000000..936d92c08
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Texture" name="Texture">
+    <panel.string name="string repeats per meter">
+        Répétitions au mètre
+    </panel.string>
+    <panel.string name="string repeats per face">
+        Répétitions par face
+    </panel.string>
+    <text name="color label">
+        Couleur
+    </text>
+    <color_swatch name="colorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+    <text name="color trans">
+        % de transparence
+    </text>
+    <text name="glow label">
+        Rayonnement
+    </text>
+    <check_box label="Lumineux" name="checkbox fullbright"/>
+    <combo_box name="combobox matmedia">
+        <combo_box.item label="Matériaux" name="Materials"/>
+        <combo_box.item label="Médias" name="Media"/>
+    </combo_box>
+    <combo_box name="combobox mattype">
+        <combo_box.item label="Texture (diffuse)" name="Texture (diffuse)"/>
+        <combo_box.item label="Relief (normal)" name="Bumpiness (normal)"/>
+        <combo_box.item label="Brillance (spéculaire)" name="Shininess (specular)"/>
+    </combo_box>
+    <texture_picker label="Texture" name="texture control" tool_tip="Cliquer pour sélectionner une image."/>
+    <text name="label alphamode">
+        Mode alpha
+    </text>
+    <combo_box name="combobox alphamode">
+        <combo_box.item label="Aucun" name="None"/>
+        <combo_box.item label="Fusion alpha" name="Alpha blending"/>
+        <combo_box.item label="Masquage alpha" name="Alpha masking"/>
+        <combo_box.item label="Masque émissif" name="Emissive mask"/>
+    </combo_box>
+    <text name="label maskcutoff">
+        Coupe du masque
+    </text>
+    <texture_picker label="Texture" name="bumpytexture control" tool_tip="Cliquer pour sélectionner une image."/>
+    <text name="label bumpiness">
+        Relief
+    </text>
+    <combo_box name="combobox bumpiness">
+        <combo_box.item label="Aucun" name="None"/>
+        <combo_box.item label="Luminosité" name="Brightness"/>
+        <combo_box.item label="Obscurité" name="Darkness"/>
+        <combo_box.item label="aggloméré" name="woodgrain"/>
+        <combo_box.item label="écorce" name="bark"/>
+        <combo_box.item label="briques" name="bricks"/>
+        <combo_box.item label="damier" name="checker"/>
+        <combo_box.item label="béton" name="concrete"/>
+        <combo_box.item label="carrelage" name="crustytile"/>
+        <combo_box.item label="pierre de taille" name="cutstone"/>
+        <combo_box.item label="disques" name="discs"/>
+        <combo_box.item label="gravier" name="gravel"/>
+        <combo_box.item label="boîte de Petri" name="petridish"/>
+        <combo_box.item label="lattes" name="siding"/>
+        <combo_box.item label="carreaux" name="stonetile"/>
+        <combo_box.item label="stuc" name="stucco"/>
+        <combo_box.item label="ventouses" name="suction"/>
+        <combo_box.item label="tissage" name="weave"/>
+    </combo_box>
+    <texture_picker label="Texture" name="shinytexture control" tool_tip="Cliquer pour sélectionner une image."/>
+    <text name="label shininess">
+        Brillance
+    </text>
+    <combo_box name="combobox shininess">
+        <combo_box.item label="Aucune" name="None"/>
+        <combo_box.item label="Faible" name="Low"/>
+        <combo_box.item label="Moyenne" name="Medium"/>
+        <combo_box.item label="Élevée" name="High"/>
+    </combo_box>
+    <text name="label glossiness">
+        Lustrage
+    </text>
+    <text name="label environment">
+        Environnement
+    </text>
+    <text name="label shinycolor">
+        Couleur
+    </text>
+    <color_swatch name="shinycolorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+    <text name="media_info">
+        L&apos;URL du média choisi, le cas échéant, se place ici.
+    </text>
+    <button label="Choisir..." name="add_media" tool_tip="Ajouter un média"/>
+    <button label="Supprimer" name="delete_media" tool_tip="Supprimer cette texture de média"/>
+    <button label="Aligner" label_selected="Aligner le média" name="button align" tool_tip="Ajuster la texture du média (le chargement doit d’abord se terminer)"/>
+    <check_box label="Synchroniser les materials" name="checkbox maps sync" tool_tip="Synchronise les parametres de la map de la texture"/>
+    <text name="tex gen">
+        Application
+    </text>
+    <check_box label="Aligner les faces Plan" name="checkbox planar align" tool_tip="Aligner les textures sur toutes les faces sélectionnées avec la dernière face sélectionnée. Application de la texture Plan requise."/>
+    <combo_box name="combobox texgen">
+        <combo_box.item label="Valeur par défaut" name="Default"/>
+        <combo_box.item label="Plan" name="Planar"/>
+    </combo_box>
+    <spinner label="Échelle horizontale" name="TexScaleU"/>
+    <button name="flipTextureScaleU" tool_tip="Inverser"/>
+    <spinner label="Échelle verticale" name="TexScaleV"/>
+    <button name="flipTextureScaleV" tool_tip="Inverser"/>
+    <spinner label="Répétitions au mètre" name="rptctrl"/>
+    <spinner label="Degrés de rotation" name="TexRot"/>
+
+    <spinner label="Décalage horizontal" name="TexOffsetU"/>
+    <spinner label="Décalage vertical" name="TexOffsetV"/>
+    <spinner label="Échelle horizontale" name="bumpyScaleU"/>
+    <spinner label="Échelle verticale" name="bumpyScaleV"/>
+    <spinner label="Degrés de rotation" name="bumpyRot"/>
+
+    <spinner label="Décalage horizontal" name="bumpyOffsetU"/>
+    <spinner label="Décalage vertical" name="bumpyOffsetV"/>
+    <spinner label="Échelle horizontale" name="shinyScaleU"/>
+    <spinner label="Échelle verticale" name="shinyScaleV"/>
+    <spinner label="Degrés de rotation" name="shinyRot"/>
+
+    <spinner label="Décalage horizontal" name="shinyOffsetU"/>
+    <spinner label="Décalage vertical" name="shinyOffsetV"/>
+    <button label="Copier" name="copytextures" tool_tip="Copie les paramètres de la texture dans le presse papier"/>
+    <button label="Coller" name="pastetextures" tool_tip="Colle les paramètres de la texture du presse papier"/>
+</panel>