diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 4a4b3863b..ec425421b 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -4655,8 +4655,8 @@ void LLSelectMgr::packObjectName(LLSelectNode* node, void* user_data)
 void LLSelectMgr::packObjectDescription(LLSelectNode* node, void* user_data)
 {
 	const std::string* desc = (const std::string*)user_data;
-	if(!desc->empty())
-	{
+	if(desc)
+	{	// Empty (non-null, but zero length) descriptions are OK
 		gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
 		gMessageSystem->addU32Fast(_PREHASH_LocalID, node->getObject()->getLocalID());
 		gMessageSystem->addStringFast(_PREHASH_Description, *desc);
diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h
index c1814874d..ac6ac0227 100644
--- a/indra/newview/lltexturecache.h
+++ b/indra/newview/lltexturecache.h
@@ -24,7 +24,7 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLTEXTURECACHE_
+#ifndef LL_LLTEXTURECACHE_H
 #define LL_LLTEXTURECACHE_H
 
 #include "lldir.h"
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index 514e29e4e..39a3cc6c8 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -58,7 +58,7 @@
       <view_border blevel_style="in" bottom_delta="-20" follows="left|top" height="18" left_delta="5" mouse_opaque="false" name="im_give_drop_target_rect" width="220"/>
 	  <text bottom_delta="0" drop_shadow_visible="true" follows="left|top" halign="center" height="16" name="im_give_disp_rect_txt" tool_tip="Drop an inventory item here to have it given along with the auto-response." width="230">Drop item here (Currently: NONE)</text>
 	  <text bottom_delta="140" left_delta="240" follows="left|top" height="18" name="text_box1">Response Text:</text>
-      <text_editor bottom_delta="-110" follows="left|top" height="110" max_length="1100" name="im_response" width="230" word_wrap="true" spell_check="true"/>
+      <text_editor bottom_delta="-110" follows="left|top" height="110" max_length="1100" name="im_response" width="230" word_wrap="true" spell_check="true" hide_scrollbar="true"/>
       <text bottom_delta="-25" follows="left|top" height="18" name="text_box2">
 #f for user's first name, #l for last name,
 #t for timestamp, #r for SLURL to you,
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 823d29b0d..ddaa8c806 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,7 +37,8 @@
       <check_box label="Ne pas montrer les IMs auxquels vous avez r&#xE9;pondu" name="AscentInstantMessageShowResponded"/>
       <check_box label="Auto-r&#xE9;ponse &#xE0; chaque message" name="AscentInstantMessageResponseRepeat"/>
       <check_box label="Joindre un objet &#xE0; la r&#xE9;ponse" name="AscentInstantMessageResponseItem" tool_tip="Glissez l'objet dans la fen&#xEA;tre de r&#xE9;ponse."/>
-	  <text bottom_delta="120" left_delta="280" follows="left|top" height="18" name="text_box1">Texte de la r&#xE9;ponse :</text>
+	  <text bottom_delta="140" left_delta="280" follows="left|top" height="18" name="text_box1">Texte de la r&#xE9;ponse :</text>
+      <text_editor bottom_delta="-130" height="130" name="im_response" width="190"/>
       <text name="text_box2">
 #f Pr&#xE9;nom,#l Nom,#t Dur&#xE9;e,#r SLURL,
 #i Dur&#xE9;e de 'l'IDLE'. (ex. "5 mins")
@@ -67,13 +68,15 @@
 
 	  <text name="Block All Dialogs From">Bloquer tous les dialogues provenants de :</text>
       <check_box label="Alertes" name="Alerts"/>
-      <check_box label="Demande d'amitié" name="Friendship Offers" left_delta="80"/>
-      <check_box label="Invitations de groupes" name="Group Invites" left_delta="120"/>
-      <check_box label="Notices de groupes" name="Group Notices" left_delta="140"/>
+      <check_box label="Demande d'amitié" name="Friendship Offers"/>
+      <check_box label="Invitation de groupe" name="Group Invites"/>
+      <check_box label="Notices de groupes" name="Group Notices"/>
       <check_box label="Offre d'objets" name="Item Offers"/>
       <check_box label="Scripts" name="Scripts"/>
       <check_box label="Offres de TP" name="Teleport Offers"/>
       <check_box label="Me notifier quand un spam est bloqu&#xE9;" name="Notify On Spam" tool_tip="When enabled, the bottom right corner may become a source of pseudo-spam whenever real spam is blocked."/>
+      <check_box label="Invit. de fee de grp" name="Group Fee Invites"/>
+      <check_box label="Active les sons des gestures" name="Enable Gesture Sounds"/>
     </panel>
 
     <panel label="Options de Texte" name="TextOptions">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
index 963644c50..e89a2a6b0 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
@@ -206,51 +206,22 @@ Se tp vers un avatar (usage: cmd nom)
         label="Affiche les changements de d&#xE9;comptes de scripts de la r&#xE9;gion." left_delta="0"
         name="totalscriptjumps" width="270"
         tool_tip="D&#xE9;pendant du seuil que vous choisissez dans la fen&#xEA;tre &#xE0; droite."/>
-      <spinner name="ScriptJumpCount" tool_tip="Threshold for the script jump message [Default: 100]"/>
+      <spinner left_delta="350" name="ScriptJumpCount" tool_tip="Threshold for the script jump message [Default: 100]"/>
     </panel>
 
     <panel label="Build/Cr&#xE9;ation" name="Building">
-      <text left_delta="30" name="text_box6">Point de Pivot</text>
-      <spinner label="X pos" label_width="40" left="10" name="X pos" width="120"/>
-      <spinner label="Y pos" label_width="40" name="Y pos" width="120"/>
-      <spinner label="Z pos" label_width="40" name="Z pos" width="120"/>
-      <check_box bottom_delta="-20" label="Valeurs en pour&#xE7;entages" left_delta="-5" tool_tip="Default settings are Percentages and every axis set at 50" name="EmPivotPercToggle"/>
-      <check_box bottom_delta="60" label="Active les &#x22;Highlights&#x22; sur les prims s&#xE9;lectionn&#xE9;s" left_delta="140" name="EmBuildPrefsRenderHighlight_toggle"/>
-	  <check_box bottom_delta="-20" label="Axe sur le Root Prim" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead." name="EmBuildPrefsActualRoot_toggle"/>
-      <text bottom_delta="60" follows="top" height="10" left_delta="10" name="text_box7">Permissions:</text>
-        <check_box label="Copy " tool_tip="Next owner can make copies of creations" name="next_owner_copy"/>
-        <check_box label="Modify " tool_tip="Next owner can edit creations" name="next_owner_modify"/>
-        <check_box label="Transfer " tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer"/>
-      <texture_picker bottom="-190" label="     Texture" left="155" name="texture control" tool_tip="Click to choose a texture" width="64"/>
-      <check_box bottom="-131" left_delta="75" label="Phantom" name="EmPhantomToggle"/>
+      <text name="text_box6">Point de Pivot</text>
+      <check_box label="Valeurs en %" name="EmPivotPercToggle"/>
+      <check_box label="Active les &#x22;Highlights&#x22; sur les prims s&#xE9;lectionn&#xE9;s" name="EmBuildPrefsRenderHighlight_toggle"/>
+	  <check_box label="Axe sur le Root Prim" name="EmBuildPrefsActualRoot_toggle"/>
+      <text name="text_box7">Permissions :</text>
+      <check_box label="Phantom" name="EmPhantomToggle"/>
       <check_box label="Physical" name="EmPhysicalToggle"/>
       <check_box label="Temporaire" name="EmTemporaryToggle"/>
-      <combo_box bottom="-190" left_delta="6" name="material" width="64">
-        <combo_item name="Stone">Stone</combo_item>
-        <combo_item name="Metal">Metal</combo_item>
-        <combo_item name="Glass">Glass</combo_item>
-        <combo_item name="Wood">Wood</combo_item>
-        <combo_item name="Flesh">Flesh</combo_item>
-        <combo_item name="Plastic">Plastic</combo_item>
-        <combo_item name="Rubber">Rubber</combo_item>
-      </combo_box>
-      <color_swatch label="    Couleur" left_delta="76" name="colorswatch" tool_tip="Click to open Color Picker" width="64"/>
-      <spinner bottom_delta="60" label="Alpha" label_width="45" left_delta="70" width="97"/>
-      <spinner bottom_delta="-20" label="Glow" label_width="45" name="glow" width="97"/>
+      <color_swatch label="    Couleur" name="colorswatch"/>
       <check_box label="Lumineux" name="EmFBToggle"/>
-      <combo_box bottom_delta="-5" left_delta="42" name="combobox shininess" tool_tip="Set the amount of shine for the object" width="62">
-        <combo_item name="None" value="None">None</combo_item>
-        <combo_item name="Low" value="Low">Low</combo_item>
-        <combo_item name="Medium" value="Medium">Medium</combo_item>
-        <combo_item name="High" value="High">High</combo_item>
-      </combo_box>
-      <check_box name="EmeraldBuildPrefsEmbedItem" left="5" bottom_delta="-15" label="Mettre un &#xE9;l&#xE9;ment dans l'object"/>
-        <text bottom_delta="0" left_delta="8" name="Give inventory">Glissez l'&#xE9;l&#xE9;ment ICI</text>
-         <text bottom_delta="15" left_delta="0" name="build_item_add_disp_rect_txt" halign="center" width="138">Currently set to:
-	       ITEM</text>
-       <spinner bottom="369" left="380" label="          X" label_width="40" name="X size" width="110"/>
-       <spinner bottom_delta="-20" label="          Y" label_width="40" name="Y size" width="110"/>
-       <spinner bottom_delta="-20" label="          Z" label_width="40" name="Z size" width="110"/>
+      <check_box name="EmeraldBuildPrefsEmbedItem" label="Mettre un &#xE9;l&#xE9;ment dans l'object"/>
+        <text name="Give inventory">Glissez l'&#xE9;l&#xE9;ment ICI</text>
     </panel>
 
   </tab_container>
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 5eddc2f42..d9c683146 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -62,8 +62,8 @@
 	<text name="text2">
 		Options d'affichage :
 	</text>
-	<check_box label="Lancer Singularity dans une fen&#xEA;tre (et non pas, PAR la fen&#xEA;tre)" name="windowed mode"/>
-	<button label="Param&#xE8;tres recommand&#xE9;s" tool_tip="Reset to recommended graphics settings" name="Defaults"/>
+	<check_box label="Lancer Singularity dans une fen&#xEA;tre (non pas, PAR la fen&#xEA;tre)" name="windowed mode"/>
+	<button left="330" width="165" label="Param&#xE8;tres recommand&#xE9;s" tool_tip="Reset to recommended graphics settings" name="Defaults"/>
 	<check_box label="Auto-d&#xE9;tection du ratio" left="350" name="aspect_auto_detect"/>
 	<check_box label="Utiliser &#xE9;chelle de r&#xE9;solution ind&#xE9;pendante" name="ui_auto_scale"/>
 	<check_box label="Montrer l'avatar en vue subjective" name="avfp"/>