merge changes for 4.0.1-release

22 files changed, 353 insertions, 323 deletions

diff --git a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml
index 9a6f5e0166..d427376574 100644
--- a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml
@@ -141,35 +141,35 @@ Maximal erlaubt sind [MAX_LENGTH] Sekunden.
 		Ausdruck
 	</text>
 	<combo_box name="emote_combo" tool_tip="Steuert Gesichtsregungen während der Animation">
-		<item label="(Keine)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Ängstlich" name="Afraid" value="Ängstlich"/>
-		<item label="Verärgert" name="Angry" value="Verärgert"/>
-		<item label="Grinst" name="BigSmile" value="Grinst"/>
-		<item label="Gelangweilt" name="Bored" value="Gelangweilt"/>
-		<item label="Weinen" name="Cry" value="Weinen"/>
-		<item label="Verachtung" name="Disdain" value="Verachtung"/>
-		<item label="Verlegen" name="Embarrassed" value="Verlegen"/>
-		<item label="Stirnrunzeln" name="Frown" value="Stirnrunzeln"/>
-		<item label="Küssen" name="Kiss" value="Küssen"/>
-		<item label="Lachen" name="Laugh" value="Lachen"/>
-		<item label="Bäääh" name="Plllppt" value="Bäääh"/>
-		<item label="Angewidert" name="Repulsed" value="Angewidert"/>
-		<item label="Traurig" name="Sad" value="Traurig"/>
-		<item label="Achselzucken" name="Shrug" value="Achselzucken"/>
-		<item label="Lächeln" name="Smile" value="Lächeln"/>
-		<item label="Überraschung" name="Surprise" value="Überraschung"/>
-		<item label="Zwinkern" name="Wink" value="Zwinkern"/>
-		<item label="Sorgenvoll" name="Worry" value="Sorgenvoll"/>
+		<item label="(Keine)" name="[None]"/>
+		<item label="Aaaaah" name="Aaaaah"/>
+		<item label="Ängstlich" name="Afraid"/>
+		<item label="Verärgert" name="Angry"/>
+		<item label="Grinst" name="BigSmile"/>
+		<item label="Gelangweilt" name="Bored"/>
+		<item label="Weinen" name="Cry"/>
+		<item label="Verachtung" name="Disdain"/>
+		<item label="Verlegen" name="Embarrassed"/>
+		<item label="Stirnrunzeln" name="Frown"/>
+		<item label="Küssen" name="Kiss"/>
+		<item label="Lachen" name="Laugh"/>
+		<item label="Bäääh" name="Plllppt"/>
+		<item label="Angewidert" name="Repulsed"/>
+		<item label="Traurig" name="Sad"/>
+		<item label="Achselzucken" name="Shrug"/>
+		<item label="Lächeln" name="Smile"/>
+		<item label="Überraschung" name="Surprise"/>
+		<item label="Zwinkern" name="Wink"/>
+		<item label="Sorgenvoll" name="Worry"/>
 	</combo_box>
 	<text name="preview_label">
 		Vorschau während:
 	</text>
 	<combo_box name="preview_base_anim" tool_tip="Hiermit können Sie das Verhalten Ihres Avatars testen, während Ihr Avatar normale Bewegungen ausführt.">
-		<item label="Stehen" name="Standing" value="Stehen"/>
-		<item label="Gehen" name="Walking" value="Gehen"/>
-		<item label="Sitzen" name="Sitting" value="Sitzen"/>
-		<item label="Fliegen" name="Flying" value="Fliegen"/>
+		<item label="Stehen" name="Standing"/>
+		<item label="Gehen" name="Walking"/>
+		<item label="Sitzen" name="Sitting"/>
+		<item label="Fliegen" name="Flying"/>
 	</combo_box>
 	<spinner label="Einblenden (s)" name="ease_in_time" tool_tip="Einblendungszeit für Animationen (in Sekunden)"/>
 	<spinner label="Ausblenden (s)" name="ease_out_time" tool_tip="Ausblendungszeit für Animationen (in Sekunden)"/>
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index edf028bf60..384ae6bb1e 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2,13 +2,13 @@
 <floater
  positioning="cascading"
  can_tear_off="false"
- height="420"
+ height="396"
  layout="topleft"
  name="floaterland"
  help_topic="floaterland"
  save_rect="true"
  title="ABOUT LAND"
- width="490">
+ width="634">
     <floater.string
       name="maturity_icon_general">
       "Parcel_PG_Dark"
@@ -39,17 +39,18 @@
     </floater.string>
     <tab_container
      follows="all"
-     height="410"
+     halign="left"
+     height="386"
      layout="topleft"
      left="0"
      name="landtab"
-     tab_position="top"
-     tab_height="25"
-     tab_min_width="67"
-     top="10"
-     width="489">
+     tab_position="left"
+     tab_width="140"
+     tab_padding_right="3"
+     top="6"
+     width="633">
         <panel
-         border="false"
+         border="true"
          follows="all"
          label="GENERAL"
          layout="topleft"
@@ -145,7 +146,7 @@
                 Description:
             </text>
             <text_editor
-             follows="left|top|right"
+             follows="left|top"
              height="52"
              layout="topleft"
              left_pad="2"
@@ -281,7 +282,7 @@
              label="Set"
              layout="topleft"
              left_pad="4"
-             right="-10"
+             right="-154"
              name="Set..."
              width="90"
              top_delta="-2"/>
@@ -302,7 +303,7 @@
              label="Deed"
              layout="topleft"
              left_pad="2"
-             right="-10"
+             right="-154"
              name="Deed..."
              tool_tip="You may only deed land if you are an officer in the selected group."
              top_delta="-2"
@@ -365,7 +366,7 @@
              label="Sell Land"
              layout="topleft"
              left_pad="5"
-             right="-10"
+             right="-154"
              name="Sell Land..."
              width="145"
              top_delta="-25"/>
@@ -412,7 +413,7 @@
              label="Cancel Land Sale"
              label_selected="Cancel Land Sale"
              layout="topleft"
-             right="-10"
+             right="-154"
              name="Cancel Land Sale"
              left_pad="5"
              top_pad="7"
@@ -527,7 +528,7 @@
              height="23"
              label="Buy For Group"
              layout="topleft"
-             right="-10"
+             right="-154"
              name="Buy For Group..."
              top_delta="0"
              width="180" />
@@ -547,7 +548,7 @@
              height="23"
              label="Abandon Land"
              layout="topleft"
-             right="-10"
+             right="-154"
              name="Abandon Land..."
              top_pad="-47"
              width="180" />
@@ -645,8 +646,8 @@
              type="string"
              length="1"
              enabled="false"
-             follows="all"
-             height="200"
+             follows="top|left"
+             height="175"
              layout="topleft"
              left="10"
              max_length="65535"
@@ -663,7 +664,7 @@
              halign="right"
              layout="topleft"
              right="-10"
-             top_pad="0"
+             top_pad="25"
              mouse_opaque="false"
              name="covenant_timestamp_text"
              width="460">
@@ -930,7 +931,7 @@
              label_selected="Show"
              layout="topleft"
              name="ShowOwner"
-             right="-140"
+             right="-284"
              width="60"
              top_delta="-6"/>
             <button
@@ -941,7 +942,7 @@
              label="Return"
              layout="topleft"
              name="ReturnOwner..."
-             right="-10"
+             right="-154"
              tool_tip="Return objects to their owners."
              width="119"
              top_delta="0"/>
@@ -978,7 +979,7 @@
              label_selected="Show"
              layout="topleft"
              name="ShowGroup"
-             right="-140"
+             right="-284"
              width="60"
              top_delta="-6"/>
             <button
@@ -989,7 +990,7 @@
              label="Return"
              layout="topleft"
              name="ReturnGroup..."
-             right="-10"
+             right="-154"
              tool_tip="Return objects to their owners."
              width="119"
              top_delta="0"/>
@@ -1026,7 +1027,7 @@
              label_selected="Show"
              layout="topleft"
              name="ShowOther"
-             right="-140"
+             right="-284"
              width="60"
              top_delta="-6"/>
             <button
@@ -1037,7 +1038,7 @@
              label="Return"
              layout="topleft"
              name="ReturnOther..."
-             right="-10"
+             right="-154"
              tool_tip="Return objects to their owners."
              width="119"
              top_delta="0"/>
@@ -1122,13 +1123,13 @@
              left_pad="6"
              name="Return objects..."
              top_delta="0"
-             right="-10"
+             right="-154"
              width="164" />
             <name_list
              column_padding="0"
              draw_heading="true"
-             follows="all"
-             height="180"
+             follows="top|left"
+             height="150"
              layout="topleft"
              left="10"
              name="owner list"
@@ -1321,8 +1322,8 @@ Only large parcels can be listed in search.
           <panel
             bevel_style="none"
             border="true"
-            top="146"
-            bottom="146"
+            top="121"
+            bottom="121"
             follows="left|bottom|right"
             left="20"
             right="-20"/>
@@ -1357,7 +1358,7 @@ Only large parcels can be listed in search.
              enabled="true"
              height="23"
              layout="topleft"
-             left="20"
+             left="164"
              top="194"
              name="land category"
              visible="true"
@@ -1494,7 +1495,7 @@ Only large parcels can be listed in search.
              label_selected="Set"
              layout="topleft"
              name="Set"
-             left="255"
+             left="399"
              tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
              width="50" />
             <button
@@ -1525,6 +1526,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              name="landing type"
              top_pad="0"
+             left="399"
              tool_tip="Teleport Routing -- select how to handle teleports onto your land"
              width="120">
                 <combo_box.item
@@ -1568,7 +1570,7 @@ Only large parcels can be listed in search.
             <combo_box
              height="23"
              layout="topleft"
-             left_pad="0"
+             left_pad="144"
              name="media type"
              tool_tip="Specify if the URL is a movie, web page, or other media"
              width="120"
@@ -1577,7 +1579,7 @@ Only large parcels can be listed in search.
              follows="left|top"
              height="16"
              layout="topleft"
-             left_pad="10"
+             left_pad="-134"
              name="mime_type"
              width="200" />
             <text
@@ -1607,7 +1609,7 @@ Only large parcels can be listed in search.
              height="23"
              label="Set"
              layout="topleft"
-             left_pad="5"
+             left_pad="149"
              name="set_media_url"
              width="70"
              top_delta="0"/>
@@ -1952,7 +1954,7 @@ Only large parcels can be listed in search.
             <combo_box
              height="23"
              layout="topleft"
-             left_pad="22"
+             left_pad="166"
              name="pass_combo"
              top_delta="0"
              width="100">
@@ -2050,7 +2052,7 @@ Only large parcels can be listed in search.
             follows="top|right"
             height="170"
             width="240"
-            left_pad="2">
+            left_pad="146">
             <text
              type="string"
              length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index 178987962b..f182d27da8 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -6,7 +6,7 @@
  height="570"
  help_topic="sidebar_inventory"
  min_width="333"
- min_height="570"
+ min_height="590"
  name="floater_my_inventory"
  save_rect="true"
  save_visibility="true"
diff --git a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
index afc609de52..c17d2a1f37 100644
--- a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
+++ b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
@@ -136,15 +136,15 @@
     </tab_container>
     
     <layout_stack width="336" height="26" enabled="true" orientation="horizontal"  follows="left|right" name="ButtonsStack">
-      <layout_panel width="336" height="30" enabled="true" orientation="horizontal" name="CondenseAllButtonPanel">
+      <layout_panel width="336" height="30" enabled="true" name="CondenseAllButtonPanel">
         <button width="93" height="21" left="2" label="Collapse all" name="collapse_all_button">
         </button>
       </layout_panel>
-      <layout_panel width="336" height="30" enabled="true" orientation="horizontal" name="GapLayoutPanel">
+      <layout_panel width="336" height="30" enabled="true" name="GapLayoutPanel">
         <panel width="90" height="21" left="2" label="Gap Panel" border="false" name="GapPanel">
         </panel>
       </layout_panel>
-      <layout_panel width="336" height="30" enabled="true" orientation="horizontal" name="DeleteAllButtonPanel">
+      <layout_panel width="336" height="30" enabled="true" name="DeleteAllButtonPanel">
         <button width="93" height="21" left="2" label="Delete all" name="delete_all_button">
         </button>
       </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index af1617eb39..590d9d1844 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -57,6 +57,21 @@
      width="552">
         Please read the following Terms of Service and Privacy Policy carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement.
     </text>
+     <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="30"
+     layout="topleft"
+     left="16"
+     name="external_tos_required"
+     visible="false"
+     top="32"
+     word_wrap="true"
+     width="552">
+       You will need to go to my.secondlife.com and log in to accept the Terms of Service before you can proceed. Thank you!
+     </text>
     <web_browser
       trusted_content="true" 
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 73ca7c529d..419ec359a6 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -236,7 +236,7 @@
        name="Web Content Floater Debug Test">
         <menu_item_call.on_click
          function="Advanced.WebContentTest"
-         parameter="http://google.com"/>
+         parameter="https://callum-linden.s3.amazonaws.com/ceftests.html"/>
       </menu_item_call>
       <menu
        create_jump_keys="true"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3f557d0d0f..8de9a1a99a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1438,7 +1438,7 @@
                  function="Floater.Show"
                  parameter="bumps" />
         </menu_item_call>
-        <menu_item_separator/>
+        <menu_item_separator/>    
         <menu_item_call
          label="About [APP_NAME]"
          name="About Second Life">
@@ -3191,7 +3191,7 @@
            shortcut="control|shift|Z">
             <menu_item_call.on_click
              function="Advanced.WebContentTest"
-             parameter="http://google.com"/>
+             parameter="https://callum-linden.s3.amazonaws.com/ceftests.html"/>
           </menu_item_call>
           <menu_item_call
            label="FB Connect Test"
diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
index f5f2223330..7cb4a6e53b 100644
--- a/indra/newview/skins/default/xui/en/mime_types.xml
+++ b/indra/newview/skins/default/xui/en/mime_types.xml
@@ -7,7 +7,7 @@
 		none
 	</defaultwidget>
 	<defaultimpl>
-		media_plugin_webkit
+		media_plugin_cef
 	</defaultimpl>
 	<widgetset name="web">
 		<label name="web_label">
@@ -141,7 +141,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="none/none">
@@ -152,7 +152,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/*">
@@ -185,7 +185,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
@@ -207,7 +207,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/ogg">
@@ -229,7 +229,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/postscript">
@@ -240,7 +240,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/rtf">
@@ -251,7 +251,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/smil">
@@ -262,7 +262,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
@@ -273,7 +273,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/x-director">
@@ -284,7 +284,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mid">
@@ -339,7 +339,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/gif">
@@ -350,7 +350,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/jpeg">
@@ -361,7 +361,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/png">
@@ -372,7 +372,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="image/svg+xml">
@@ -383,7 +383,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/tiff">
@@ -394,7 +394,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="text/html">
@@ -405,7 +405,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="text/plain">
@@ -416,7 +416,7 @@
 			text
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="text/xml">
@@ -427,7 +427,7 @@
 			text
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/mpeg">
diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml
index 90230f12dd..f71c24b2e4 100644
--- a/indra/newview/skins/default/xui/en/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml
@@ -7,7 +7,7 @@
 		none
 	</defaultwidget>
 	<defaultimpl>
-		media_plugin_webkit
+		media_plugin_cef
 	</defaultimpl>
 	<widgetset name="web">
 		<label name="web_label">
@@ -152,7 +152,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/*">
@@ -185,7 +185,7 @@
 			image
 		</widgettype>
         <impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
@@ -207,7 +207,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/ogg">
@@ -229,7 +229,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/postscript">
@@ -240,7 +240,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/rtf">
@@ -251,7 +251,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/smil">
@@ -262,7 +262,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
@@ -273,7 +273,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/x-director">
@@ -284,7 +284,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mid">
@@ -339,7 +339,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/gif">
@@ -350,7 +350,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/jpeg">
@@ -361,7 +361,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/png">
@@ -372,7 +372,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="image/svg+xml">
@@ -383,7 +383,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/tiff">
@@ -394,7 +394,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="text/html">
@@ -405,7 +405,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="text/plain">
@@ -416,7 +416,7 @@
 			text
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="text/xml">
@@ -427,7 +427,7 @@
 			text
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/mpeg">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 70ba4d5077..b4c5cba1fd 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1592,11 +1592,24 @@ The object may be out of range or may have been deleted.
    icon="alertmodal.tga"
    name="CannotDownloadFile"
    type="alertmodal">
-Unable to download file
-  <tag>fail</tag>
+    Unable to download file
+    <tag>fail</tag>
   </notification>
 
   <notification
+  name="MediaFileDownloadUnsupported"
+  label=""
+  type="alert">
+    <unique/>
+    <tag>confirm</tag>
+    You have requested a file download, which is not supported within [SECOND_LIFE].
+    <usetemplate
+     ignoretext="Warn about unsupported file downloads"
+     name="okignore"
+     yestext="OK"/>
+  </notification>
+  
+  <notification
    icon="alertmodal.tga"
    name="CannotWriteFile"
    type="alertmodal">
diff --git a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
index a909028f9f..efaaefd0e4 100644
--- a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
@@ -9,7 +9,6 @@
   left="0"
   width="331"
   height="202"
-  can_resize="true"
   layout="topleft"
   follows="left|top|right|bottom" >
   <!-- background_opaque="false" -->
@@ -45,12 +44,12 @@
       <layout_panel top="0" left="0" height="30" follows="left|top|right|bottom" layout="topleft" name="layout_panel_condensed_view" visible="false" background_opaque="false" background_visible="true" bg_alpha_color="SysWellItemUnselected">
         <panel border="true" top="0" left="5" height="30" bevel_style="none" layout="topleft" follows="left|top|right|bottom" name="panel_condensed_view">
           <layout_stack top="0" left="0" width="325" height="50" orientation="horizontal" follows="left|top|right|bottom" name="horizontal_stack">
-            <layout_panel width="30" height="39" orientation="horizontal" follows="left|top|right|bottom" name="layout_panel_right">
+            <layout_panel width="30" height="39" follows="left|top|right|bottom" name="layout_panel_right">
               <group_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="group_icon" tool_tip="Group" default_icon_name="Generic_Group" visible="true"/>
               <avatar_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="avatar_icon" tool_tip="Avatar" default_icon_name="Generic_Person" visible="false"/>
               <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="system_notification_icon" tool_tip="Icon" image_name="System_Notification" visible="false"/>
             </layout_panel>
-            <layout_panel width="260" height="50" orientation="horizontal" name="layout_panel_middle">
+            <layout_panel width="260" height="50" name="layout_panel_middle">
               <panel border="false" top="0" width="260" height="38" bevel_style="none" follows="left|top|right" layout="topleft" name="main_info_panel">
                 <panel border="false" top="0" left="0" width="260" height="19" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="notification_title_panel">
                   <text allow_scroll="false" font="SansSerifSmall" top="6" left="0" width="260" height="12" layout="topleft" follows="right|left" text_color="White"
@@ -69,7 +68,7 @@
                 </panel>
               </panel>
             </layout_panel>
-            <layout_panel width="18" height="48" orientation="horizontal" follows="right|top|bottom" name="layout_panel_right">
+            <layout_panel width="18" height="48" follows="right|top|bottom" name="layout_panel_right">
               <panel top="0" left="0" width="17"  height="39" follows="left|top|right|bottom" layout="topleft" name="close_expand_panel">
                 <button top="0" left="0" width="17" height="17" layout="topleft" follows="top" name="close_btn" mouse_opaque="true"
                   tab_stop="false" image_unselected="Icon_Close_Foreground" image_selected="Icon_Close_Press" />
@@ -83,13 +82,13 @@
       <layout_panel top="0" left="0" height="196" follows="left|top|right|bottom" layout="topleft" name="layout_panel_expanded_view" visible="true" background_opaque="false" background_visible="true" bg_alpha_color="SysWellItemUnselected">
         <panel border="true" top="0" left="5" height="196" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="panel_expanded_view">
           <layout_stack top="0" left="0" width="325" height="196" orientation="horizontal" follows="left|top|right|bottom" name="horizontal_stack">
-            <layout_panel width="30" height="170" orientation="horizontal" follows="left|top|bottom" name="layout_panel_right_exp">
+            <layout_panel width="30" height="170" follows="left|top|bottom" name="layout_panel_right_exp">
               <group_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="group_icon_exp" tool_tip="Group" default_icon_name="Generic_Group" visible="true"/>
               <avatar_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="avatar_icon_exp" tool_tip="Avatar" default_icon_name="Generic_Person" visible="false"/>
               <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="system_notification_icon_exp" tool_tip="Icon" image_name="System_Notification" visible="false"/>
               <icon left="12" top="144" width="20" height="20" name="attachment_icon_exp" tool_tip="Attachment" image_name="Icon_Attachment_Large" follows="left" mouse_opaque="true" visible="false"/>
             </layout_panel>
-            <layout_panel width="230" height="196" orientation="horizontal" follows="left|top|right|bottom" name="layout_panel_middle_exp">
+            <layout_panel width="230" height="196" follows="left|top|right|bottom" name="layout_panel_middle_exp">
               <panel border="false" top="0" width="230" height="196" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="main_info_panel_expanded">
               <panel border="false" top="0" left="0" width="230" height="30" bevel_style="none" follows="left|top|right" layout="topleft" name="notification_title_panel_exp" >
                       <text allow_scroll="false" font="SansSerif" top="6" left="0" width="233" height="10" layout="topleft" follows="right|left" text_color="White"
@@ -128,7 +127,7 @@
                    </panel>
               </panel>              
             </layout_panel>             
-            <layout_panel width="18" orientation="horizontal" follows="right|top|bottom" name="layout_panel_left_exp">
+            <layout_panel width="18" follows="right|top|bottom" name="layout_panel_left_exp">
               <panel top="0" left="0" width="17" follows="left|top|right|bottom" layout="topleft" name="close_expand_panel_exp">
                 <button top="0" left="2" width="17" height="17" layout="topleft" follows="top" name="close_expanded_btn" mouse_opaque="true"
                   tab_stop="false" image_unselected="Icon_Close_Foreground" image_selected="Icon_Close_Press" />
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 4fb8b9a67f..2cb06d6877 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -53,6 +53,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 	<string
 	 name="AltMiniMapToolTipMsg"
 	 value="[REGION](Double-click to teleport, shift-drag to pan)"/>
+	<string
+	 name="GroupCountWithInfo"
+	 value="You belong to [COUNT] groups, and can join [REMAINING] more.  [secondlife:/// Want more?]"/>
     <tab_container
      bottom="-10"
      follows="all"
@@ -506,7 +509,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                 left="3"
                 use_ellipses="true"
                 name="groupcount">
-              You belong to [COUNT] groups, and can join [REMAINING] more.  [secondlife:/// Want more?]
+              You belong to [COUNT] groups, and can join [REMAINING] more.
             </text>
             <group_list
              allow_select="true" 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index b201e071ef..45b2b6ec27 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -224,19 +224,6 @@
     radio_style="false"
     width="400"
     top_pad="5"/>
-  <check_box
-    top_delta="4"
-    enabled="true"
-    follows="left|top"
-    height="14"
-    initial_value="false"
-    control_name="MediaEnablePopups"
-    label="Enable media browser pop-ups"
-    left_delta="0"
-    mouse_opaque="true"
-    name="media_popup_enabled"
-    width="400"           
-    top_pad="5"/>
   <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index cb6b2fafd8..2dae1025ec 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -117,26 +117,37 @@
                  name="Media"
                  value="Media" />
             </combo_box>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_pad="10"
-             name="combobox mattype"
-             top_delta="0"
-             width="155">
-                <combo_box.item
-                 label="Texture (diffuse)"
-                 name="Texture (diffuse)"
-                 value="Texture (diffuse)" />
-                <combo_box.item
-                 label="Bumpiness (normal)"
-                 name="Bumpiness (normal)"
-                 value="Bumpiness (normal)" />
-                <combo_box.item
-                 label="Shininess (specular)"
-                 name="Shininess (specular)"
-                 value="Shininess (specular)" />
-            </combo_box>
+            <radio_group
+            control_name="ComboMaterialType"
+            height="50"
+            layout="topleft"
+            left_pad="20"
+            top_delta="-10"
+            width="150"
+            visible = "false"
+            name="radio_material_type">
+                <radio_item
+                label="Texture (diffuse)"
+                name="Texture (diffuse)"
+                top="0" 
+                layout="topleft"
+                height="16" 
+                value="0"/>
+                <radio_item
+                label="Bumpiness (normal)"
+                layout="topleft"
+                top_pad="1" 
+                height="16" 
+                name="Bumpiness (normal)"
+                value="1"/>
+                <radio_item
+                label="Shininess (specular)"
+                name="Shininess (specular)"
+                height="16"
+                layout="topleft"
+                top_pad="1"
+                value="2"/>
+            </radio_group> 
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
@@ -148,7 +159,7 @@
              left="10"
              name="texture control"
              tool_tip="Click to choose a picture"
-             top_pad="8"
+             top_pad="7"
              width="64" />
             <text
              type="string"
@@ -350,7 +361,7 @@
              name="label shininess"
              left_pad="10"
              text_readonly_color="LabelDisabledColor"
-             top_delta="6"
+             top_delta="4"
              width="90">
                 Shininess
             </text>
@@ -394,7 +405,7 @@
              left_delta="-100"
              name="label glossiness"
              text_readonly_color="LabelDisabledColor"
-             top_pad="8"
+             top_pad="7"
              width="116">
                 Glossiness
             </text>
@@ -520,7 +531,7 @@
              left="10"
              name="tex gen"
              text_readonly_color="LabelDisabledColor"
-             top_pad="60"
+             top_pad="46"
              width="140">
                 Mapping
             </text>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ce0cc48c57..5266400e77 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -50,7 +50,7 @@ OpenGL Version: [OPENGL_VERSION]
 libcurl Version: [LIBCURL_VERSION]
 J2C Decoder Version: [J2C_VERSION]
 Audio Driver Version: [AUDIO_DRIVER_VERSION]
-Qt Webkit Version: [QT_WEBKIT_VERSION]
+LLCEFLib/CEF Version: [LLCEFLIB_VERSION]
 Voice Server Version: [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml
index 84c40b5987..a20b8cdf72 100644
--- a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml
@@ -141,35 +141,35 @@ La limite maximale est de [MAX_LENGTH] secondes.
 		Expression
 	</text>
 	<combo_box name="emote_combo" tool_tip="Contrôle ce que fait le visage pendant l&apos;animation.">
-		<item label="(Aucune)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Effrayé" name="Afraid" value="Effrayé"/>
-		<item label="En colère" name="Angry" value="En colère"/>
-		<item label="Grand sourire" name="BigSmile" value="Grand sourire"/>
-		<item label="Ennui" name="Bored" value="Ennui"/>
-		<item label="Pleurer" name="Cry" value="Pleurer"/>
-		<item label="Mépris" name="Disdain" value="Mépris"/>
-		<item label="Gêne" name="Embarrassed" value="Gêne"/>
-		<item label="Froncer les sourcils" name="Frown" value="Froncer les sourcils"/>
-		<item label="Embrasser" name="Kiss" value="Embrasser"/>
-		<item label="Rire" name="Laugh" value="Rire"/>
-		<item label="Tirer la langue" name="Plllppt" value="Tirer la langue"/>
-		<item label="Dégoût" name="Repulsed" value="Dégoût"/>
-		<item label="Triste" name="Sad" value="Triste"/>
-		<item label="Hausser les épaules" name="Shrug" value="Hausser les épaules"/>
-		<item label="Sourire" name="Smile" value="Sourire"/>
-		<item label="Surprise" name="Surprise" value="Surprise"/>
-		<item label="Clin d&apos;œil" name="Wink" value="Clin d&apos;œil"/>
-		<item label="Inquiétude" name="Worry" value="Inquiétude"/>
+		<item label="(Aucune)" name="[None]"/>
+		<item label="Aaaaah" name="Aaaaah"/>
+		<item label="Effrayé" name="Afraid"/>
+		<item label="En colère" name="Angry"/>
+		<item label="Grand sourire" name="BigSmile"/>
+		<item label="Ennui" name="Bored"/>
+		<item label="Pleurer" name="Cry"/>
+		<item label="Mépris" name="Disdain"/>
+		<item label="Gêne" name="Embarrassed"/>
+		<item label="Froncer les sourcils" name="Frown"/>
+		<item label="Embrasser" name="Kiss"/>
+		<item label="Rire" name="Laugh"/>
+		<item label="Tirer la langue" name="Plllppt"/>
+		<item label="Dégoût" name="Repulsed"/>
+		<item label="Triste" name="Sad"/>
+		<item label="Hausser les épaules" name="Shrug"/>
+		<item label="Sourire" name="Smile"/>
+		<item label="Surprise" name="Surprise"/>
+		<item label="Clin d&apos;œil" name="Wink"/>
+		<item label="Inquiétude" name="Worry"/>
 	</combo_box>
 	<text name="preview_label">
 		Aperçu
 	</text>
 	<combo_box name="preview_base_anim" tool_tip="Permet de tester le comportement de l&apos;animation lorsque votre avatar effectue certaines actions courantes.">
-		<item label="Debout" name="Standing" value="Debout"/>
-		<item label="En marche" name="Walking" value="En marche"/>
-		<item label="Assis" name="Sitting" value="Assis"/>
-		<item label="En vol" name="Flying" value="En vol"/>
+		<item label="Debout" name="Standing"/>
+		<item label="En marche" name="Walking"/>
+		<item label="Assis" name="Sitting"/>
+		<item label="En vol" name="Flying"/>
 	</combo_box>
 	<spinner label="Transition début (s)" name="ease_in_time" tool_tip="Durée (en secondes) de l&apos;entrée en fondu de l&apos;animation."/>
 	<spinner label="Transition fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) de la sortie en fondu de l&apos;animation."/>
diff --git a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml
index a4319f2e77..34ee9aaed5 100644
--- a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml
@@ -141,35 +141,35 @@ La lunghezza massima dell&apos;animazione è [MAX_LENGTH] secondi.
 		Espressione
 	</text>
 	<combo_box name="emote_combo" tool_tip="Definisce ciò che fa il viso durante l&apos;animazione">
-		<item label="(Nulla)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Spavento" name="Afraid" value="Spavento"/>
-		<item label="Arrabbiato" name="Angry" value="Arrabbiato"/>
-		<item label="Grande sorriso" name="BigSmile" value="Grande sorriso"/>
-		<item label="Annoiato" name="Bored" value="Annoiato"/>
-		<item label="Pianto" name="Cry" value="Pianto"/>
-		<item label="Disdegno" name="Disdain" value="Disdegno"/>
-		<item label="Imbarazzato" name="Embarrassed" value="Imbarazzato"/>
-		<item label="Accigliato" name="Frown" value="Accigliato"/>
-		<item label="Bacio" name="Kiss" value="Bacio"/>
-		<item label="Risata" name="Laugh" value="Risata"/>
-		<item label="Linguaccia" name="Plllppt" value="Linguaccia"/>
-		<item label="Repulsione" name="Repulsed" value="Repulsione"/>
-		<item label="Triste" name="Sad" value="Triste"/>
-		<item label="Scrollata di spalle" name="Shrug" value="Scrollata di spalle"/>
-		<item label="Sorriso" name="Smile" value="Sorriso"/>
-		<item label="Stupore" name="Surprise" value="Stupore"/>
-		<item label="Occhiolino" name="Wink" value="Occhiolino"/>
-		<item label="Preoccupato" name="Worry" value="Preoccupato"/>
+		<item label="(Nulla)" name="[None]"/>
+		<item label="Aaaaah" name="Aaaaah"/>
+		<item label="Spavento" name="Afraid" />
+		<item label="Arrabbiato" name="Angry"/>
+		<item label="Grande sorriso" name="BigSmile"/>
+		<item label="Annoiato" name="Bored"/>
+		<item label="Pianto" name="Cry"/>
+		<item label="Disdegno" name="Disdain"/>
+		<item label="Imbarazzato" name="Embarrassed"/>
+		<item label="Accigliato" name="Frown"/>
+		<item label="Bacio" name="Kiss"/>
+		<item label="Risata" name="Laugh"/>
+		<item label="Linguaccia" name="Plllppt"/>
+		<item label="Repulsione" name="Repulsed"/>
+		<item label="Triste" name="Sad"/>
+		<item label="Scrollata di spalle" name="Shrug"/>
+		<item label="Sorriso" name="Smile"/>
+		<item label="Stupore" name="Surprise"/>
+		<item label="Occhiolino" name="Wink"/>
+		<item label="Preoccupato" name="Worry"/>
 	</combo_box>
 	<text name="preview_label">
 		Anteprima mentre
 	</text>
 	<combo_box name="preview_base_anim" tool_tip="Prova il comportamento dell&apos;animazione mentre l&apos;avatar esegue attività comuni.">
-		<item label="In piedi" name="Standing" value="In piedi"/>
-		<item label="Camminare" name="Walking" value="Camminare"/>
-		<item label="Seduto" name="Sitting" value="Seduto"/>
-		<item label="Volare" name="Flying" value="Volare"/>
+		<item label="In piedi" name="Standing"/>
+		<item label="Camminare" name="Walking"/>
+		<item label="Seduto" name="Sitting"/>
+		<item label="Volare" name="Flying"/>
 	</combo_box>
 	<spinner label="Transizione in ingresso (sec)" name="ease_in_time" tool_tip="Durata (in secondi) della fusione in entrata delle animazioni"/>
 	<spinner label="Transizione in uscita (sec)" name="ease_out_time" tool_tip="Durata (in secondi) della fusione in uscita delle animazioni"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
index f74bab3598..20c7298462 100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
@@ -141,35 +141,35 @@
 		表情
 	</text>
 	<combo_box name="emote_combo" tool_tip="アニメーション再生中の顔の表情を決めます">
-		<item label="（なし）" name="[None]" value=""/>
-		<item label="アーーーーー" name="Aaaaah" value="アーーーーー"/>
-		<item label="恐れる" name="Afraid" value="恐れる"/>
-		<item label="怒る" name="Angry" value="怒る"/>
-		<item label="満面の笑み" name="BigSmile" value="満面の笑み"/>
-		<item label="退屈" name="Bored" value="退屈"/>
-		<item label="泣く" name="Cry" value="泣く"/>
-		<item label="軽蔑" name="Disdain" value="軽蔑"/>
-		<item label="恥ずかしがる" name="Embarrassed" value="恥ずかしがる"/>
-		<item label="しかめっ面" name="Frown" value="しかめっ面"/>
-		<item label="キス" name="Kiss" value="キス"/>
-		<item label="笑う" name="Laugh" value="笑う"/>
-		<item label="むかつく" name="Plllppt" value="むかつく"/>
-		<item label="嫌悪感" name="Repulsed" value="嫌悪感"/>
-		<item label="悲しい" name="Sad" value="悲しい"/>
-		<item label="肩をすくめる" name="Shrug" value="肩をすくめる"/>
-		<item label="微笑む" name="Smile" value="微笑む"/>
-		<item label="驚く" name="Surprise" value="驚く"/>
-		<item label="ウィンク" name="Wink" value="ウィンク"/>
-		<item label="心配する" name="Worry" value="心配する"/>
+		<item label="（なし）" name="[None]"/>
+		<item label="アーーーーー" name="Aaaaah"/>
+		<item label="恐れる" name="Afraid"/>
+		<item label="怒る" name="Angry"/>
+		<item label="満面の笑み" name="BigSmile"/>
+		<item label="退屈" name="Bored"/>
+		<item label="泣く" name="Cry"/>
+		<item label="軽蔑" name="Disdain"/>
+		<item label="恥ずかしがる" name="Embarrassed"/>
+		<item label="しかめっ面" name="Frown"/>
+		<item label="キス" name="Kiss"/>
+		<item label="笑う" name="Laugh"/>
+		<item label="むかつく" name="Plllppt"/>
+		<item label="嫌悪感" name="Repulsed"/>
+		<item label="悲しい" name="Sad"/>
+		<item label="肩をすくめる" name="Shrug"/>
+		<item label="微笑む" name="Smile"/>
+		<item label="驚く" name="Surprise"/>
+		<item label="ウィンク" name="Wink"/>
+		<item label="心配する" name="Worry"/>
 	</combo_box>
 	<text name="preview_label">
 		プレビュー中の動作
 	</text>
 	<combo_box name="preview_base_anim" tool_tip="これを使用して、アバターが一般的なアクションを実行している間にアニメーションの動作をテストします。">
-		<item label="立つ" name="Standing" value="立つ"/>
-		<item label="歩く" name="Walking" value="歩く"/>
-		<item label="座る" name="Sitting" value="座る"/>
-		<item label="飛ぶ" name="Flying" value="飛ぶ"/>
+		<item label="立つ" name="Standing"/>
+		<item label="歩く" name="Walking"/>
+		<item label="座る" name="Sitting"/>
+		<item label="飛ぶ" name="Flying"/>
 	</combo_box>
 	<spinner label="イーズイン（秒）" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）"/>
 	<spinner label="イーズアウト（秒）" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml
index 5cae581045..64515dfa61 100644
--- a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml
@@ -141,35 +141,35 @@ A duração máxima da animação é de [MAX_LENGTH] segundos.
 		Expressão
 	</text>
 	<combo_box name="emote_combo" tool_tip="Controla as expressões faciais durante a animação">
-		<item label="(nenhum)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Com medo" name="Afraid" value="Com medo"/>
-		<item label="Bravo" name="Angry" value="Bravo"/>
-		<item label="Sorriso contagiante" name="BigSmile" value="Sorriso contagiante"/>
-		<item label="À toa" name="Bored" value="À toa"/>
-		<item label="Chorar" name="Cry" value="Chorar"/>
-		<item label="Desdenho" name="Disdain" value="Desdenho"/>
-		<item label="Com vergonha" name="Embarrassed" value="Com vergonha"/>
-		<item label="Franzir testa" name="Frown" value="Franzir testa"/>
-		<item label="Beijo" name="Kiss" value="Beijo"/>
-		<item label="Rir" name="Laugh" value="Rir"/>
-		<item label="Mostrar a língua" name="Plllppt" value="Mostrar a língua"/>
-		<item label="Asco" name="Repulsed" value="Asco"/>
-		<item label="Triste" name="Sad" value="Triste"/>
-		<item label="Encolher os ombros" name="Shrug" value="Encolher os ombros"/>
-		<item label="Sorriso" name="Smile" value="Sorriso"/>
-		<item label="Surpresa" name="Surprise" value="Surpresa"/>
-		<item label="Piscar" name="Wink" value="Piscar"/>
-		<item label="Preocupado" name="Worry" value="Preocupado"/>
+		<item label="(nenhum)" name="[None]"/>
+		<item label="Aaaaah" name="Aaaaah"/>
+		<item label="Com medo" name="Afraid"/>
+		<item label="Bravo" name="Angry"/>
+		<item label="Sorriso contagiante" name="BigSmile"/>
+		<item label="À toa" name="Bored"/>
+		<item label="Chorar" name="Cry"/>
+		<item label="Desdenho" name="Disdain"/>
+		<item label="Com vergonha" name="Embarrassed"/>
+		<item label="Franzir testa" name="Frown"/>
+		<item label="Beijo" name="Kiss"/>
+		<item label="Rir" name="Laugh"/>
+		<item label="Mostrar a língua" name="Plllppt"/>
+		<item label="Asco" name="Repulsed"/>
+		<item label="Triste" name="Sad"/>
+		<item label="Encolher os ombros" name="Shrug"/>
+		<item label="Sorriso" name="Smile"/>
+		<item label="Surpresa" name="Surprise"/>
+		<item label="Piscar" name="Wink"/>
+		<item label="Preocupado" name="Worry"/>
 	</combo_box>
 	<text name="preview_label">
 		Visualizar enquanto
 	</text>
 	<combo_box name="preview_base_anim" tool_tip="Use para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
-		<item label="Em pé" name="Standing" value="Em pé"/>
-		<item label="Andar" name="Walking" value="Andar"/>
-		<item label="Sentado" name="Sitting" value="Sentado"/>
-		<item label="Voar" name="Flying" value="Voar"/>
+		<item label="Em pé" name="Standing"/>
+		<item label="Andar" name="Walking"/>
+		<item label="Sentado" name="Sitting"/>
+		<item label="Voar" name="Flying"/>
 	</combo_box>
 	<spinner label="Aproximação (seg)" name="ease_in_time" tool_tip="Tempo (em segundos) da transição inicial da animação"/>
 	<spinner label="Afastamento (seg)" name="ease_out_time" tool_tip="Tempo (em segundos) da transição de saída da animação"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml
index 8ad9d8657a..d709987147 100644
--- a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml
@@ -141,35 +141,35 @@
 		Выражение лица
 	</text>
 	<combo_box name="emote_combo" tool_tip="Контролирует выражение лица во время анимации">
-		<item label="(нет)" name="[None]" value=""/>
-		<item label="Ааааах" name="Aaaaah" value="Ааааах"/>
-		<item label="Боится" name="Afraid" value="Боится"/>
-		<item label="Злится" name="Angry" value="Злится"/>
-		<item label="Широко улыбается" name="BigSmile" value="Широко улыбается"/>
-		<item label="Скучает" name="Bored" value="Скучает"/>
-		<item label="Плачет" name="Cry" value="Плачет"/>
-		<item label="Презирает" name="Disdain" value="Презирает"/>
-		<item label="Смущается" name="Embarrassed" value="Смущается"/>
-		<item label="Хмурится" name="Frown" value="Хмурится"/>
-		<item label="Целует" name="Kiss" value="Целует"/>
-		<item label="Смеется" name="Laugh" value="Смеется"/>
-		<item label="Дразнится" name="Plllppt" value="Дразнится"/>
-		<item label="Не соглашается" name="Repulsed" value="Не соглашается"/>
-		<item label="Грустит" name="Sad" value="Грустит"/>
-		<item label="Не понимает" name="Shrug" value="Не понимает"/>
-		<item label="Улыбается" name="Smile" value="Улыбается"/>
-		<item label="Удивляется" name="Surprise" value="Удивляется"/>
-		<item label="Подмигивает" name="Wink" value="Подмигивает"/>
-		<item label="Беспокоится" name="Worry" value="Беспокоится"/>
+		<item label="(нет)" name="[None]"/>
+		<item label="Ааааах" name="Aaaaah"/>
+		<item label="Боится" name="Afraid"/>
+		<item label="Злится" name="Angry"/>
+		<item label="Широко улыбается" name="BigSmile"/>
+		<item label="Скучает" name="Bored"/>
+		<item label="Плачет" name="Cry"/>
+		<item label="Презирает" name="Disdain"/>
+		<item label="Смущается" name="Embarrassed"/>
+		<item label="Хмурится" name="Frown"/>
+		<item label="Целует" name="Kiss"/>
+		<item label="Смеется" name="Laugh"/>
+		<item label="Дразнится" name="Plllppt"/>
+		<item label="Не соглашается" name="Repulsed"/>
+		<item label="Грустит" name="Sad"/>
+		<item label="Не понимает" name="Shrug"/>
+		<item label="Улыбается" name="Smile"/>
+		<item label="Удивляется" name="Surprise"/>
+		<item label="Подмигивает" name="Wink"/>
+		<item label="Беспокоится" name="Worry"/>
 	</combo_box>
 	<text name="preview_label">
 		Просмотр во время
 	</text>
 	<combo_box name="preview_base_anim" tool_tip="Просмотр вашей анимации во время выполнения аватаром действий.">
-		<item label="Стояние" name="Standing" value="Стояние"/>
-		<item label="Ходьба" name="Walking" value="Ходьба"/>
-		<item label="Сидение" name="Sitting" value="Сидение"/>
-		<item label="Полет" name="Flying" value="Полет"/>
+		<item label="Стояние" name="Standing"/>
+		<item label="Ходьба" name="Walking"/>
+		<item label="Сидение" name="Sitting"/>
+		<item label="Полет" name="Flying"/>
 	</combo_box>
 	<spinner label="Вход (сек.)" name="ease_in_time" tool_tip="Количество времени (в секундах) для входа в стартовое положение"/>
 	<spinner label="Выход (сек.)" name="ease_out_time" tool_tip="Количество времени (в секундах) для выхода из анимации"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml
index f8800c674d..c4e2fd2a93 100644
--- a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml
@@ -141,35 +141,35 @@ Maksimum animasyon uzunluğu [LENGTH] saniye.
 		İfade
 	</text>
 	<combo_box name="emote_combo" tool_tip="Yüzün animasyon sırasındaki ifadesini kontrol eder">
-		<item label="(Hiçbiri)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Korkmuş" name="Afraid" value="Korkmuş"/>
-		<item label="Kızgın" name="Angry" value="Kızgın"/>
-		<item label="Yaygın Gülümseyiş" name="BigSmile" value="Yaygın Gülümseyiş"/>
-		<item label="Canı Sıkılmış" name="Bored" value="Canı Sıkılmış"/>
-		<item label="Ağlama" name="Cry" value="Ağlama"/>
-		<item label="Dudak Bükme" name="Disdain" value="Dudak Bükme"/>
-		<item label="Utanmış" name="Embarrassed" value="Utanmış"/>
-		<item label="Kaş Çatma" name="Frown" value="Kaş Çatma"/>
-		<item label="Öpücük" name="Kiss" value="Öpücük"/>
-		<item label="Gülme" name="Laugh" value="Gülme"/>
-		<item label="Kahkaha" name="Plllppt" value="Kahkaha"/>
-		<item label="Tiksinmiş" name="Repulsed" value="Tiksinmiş"/>
-		<item label="Üzgün" name="Sad" value="Üzgün"/>
-		<item label="Omuz Silkme" name="Shrug" value="Omuz Silkme"/>
-		<item label="Gülümseme" name="Smile" value="Gülümseme"/>
-		<item label="Sürpriz" name="Surprise" value="Sürpriz"/>
-		<item label="Göz Kırpma" name="Wink" value="Göz Kırpma"/>
-		<item label="Endişelenme" name="Worry" value="Endişelenme"/>
+		<item label="(Hiçbiri)" name="[None]"/>
+		<item label="Aaaaah" name="Aaaaah"/>
+		<item label="Korkmuş" name="Afraid"/>
+		<item label="Kızgın" name="Angry"/>
+		<item label="Yaygın Gülümseyiş" name="BigSmile"/>
+		<item label="Canı Sıkılmış" name="Bored"/>
+		<item label="Ağlama" name="Cry"/>
+		<item label="Dudak Bükme" name="Disdain"/>
+		<item label="Utanmış" name="Embarrassed"/>
+		<item label="Kaş Çatma" name="Frown"/>
+		<item label="Öpücük" name="Kiss"/>
+		<item label="Gülme" name="Laugh"/>
+		<item label="Kahkaha" name="Plllppt"/>
+		<item label="Tiksinmiş" name="Repulsed"/>
+		<item label="Üzgün" name="Sad"/>
+		<item label="Omuz Silkme" name="Shrug"/>
+		<item label="Gülümseme" name="Smile"/>
+		<item label="Sürpriz" name="Surprise"/>
+		<item label="Göz Kırpma" name="Wink"/>
+		<item label="Endişelenme" name="Worry"/>
 	</combo_box>
 	<text name="preview_label">
 		Şu sırada önizle
 	</text>
 	<combo_box name="preview_base_anim" tool_tip="Animasyon davranışınızı avatarınız genel hareketleri yaparken test etmek için bunu kullanın.">
-		<item label="Ayakta Duruyor" name="Standing" value="Ayakta Duruyor"/>
-		<item label="Yürüyor" name="Walking" value="Yürüyor"/>
-		<item label="Oturuyor" name="Sitting" value="Oturuyor"/>
-		<item label="Uçuyor" name="Flying" value="Uçuyor"/>
+		<item label="Ayakta Duruyor" name="Standing"/>
+		<item label="Yürüyor" name="Walking"/>
+		<item label="Oturuyor" name="Sitting"/>
+		<item label="Uçuyor" name="Flying"/>
 	</combo_box>
 	<spinner label="Yavaş Başlangıç (saniye)" name="ease_in_time" tool_tip="Animasyonun kaynaştığı süre (saniye olarak)"/>
 	<spinner label="Yavaş Bitiş (saniye)" name="ease_out_time" tool_tip="Animasyonun ayrıştığı süre (saniye olarak)"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml
index ffb0de8a68..756cca825d 100644
--- a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml
@@ -141,35 +141,35 @@
 		表情
 	</text>
 	<combo_box name="emote_combo" tool_tip="控制動作演繹時臉部的姿態">
-		<item label="（無）" name="[None]" value=""/>
-		<item label="張口吶喊貌" name="Aaaaah" value="張口吶喊貌"/>
-		<item label="害怕" name="Afraid" value="害怕"/>
-		<item label="生氣" name="Angry" value="生氣"/>
-		<item label="燦爛笑容" name="BigSmile" value="燦爛笑容"/>
-		<item label="無聊" name="Bored" value="無聊"/>
-		<item label="哭泣" name="Cry" value="哭泣"/>
-		<item label="鄙視" name="Disdain" value="鄙視"/>
-		<item label="尷尬" name="Embarrassed" value="尷尬"/>
-		<item label="皺眉" name="Frown" value="皺眉"/>
-		<item label="親吻" name="Kiss" value="親吻"/>
-		<item label="笑" name="Laugh" value="笑"/>
-		<item label="嫌惡貌" name="Plllppt" value="嫌惡貌"/>
-		<item label="作噁" name="Repulsed" value="作噁"/>
-		<item label="傷心" name="Sad" value="傷心"/>
-		<item label="聳聳肩" name="Shrug" value="聳聳肩"/>
-		<item label="微笑" name="Smile" value="微笑"/>
-		<item label="驚喜" name="Surprise" value="驚喜"/>
-		<item label="眨眼" name="Wink" value="眨眼"/>
-		<item label="擔心" name="Worry" value="擔心"/>
+		<item label="（無）" name="[None]"/>
+		<item label="張口吶喊貌" name="Aaaaah"/>
+		<item label="害怕" name="Afraid"/>
+		<item label="生氣" name="Angry"/>
+		<item label="燦爛笑容" name="BigSmile"/>
+		<item label="無聊" name="Bored"/>
+		<item label="哭泣" name="Cry"/>
+		<item label="鄙視" name="Disdain"/>
+		<item label="尷尬" name="Embarrassed"/>
+		<item label="皺眉" name="Frown"/>
+		<item label="親吻" name="Kiss"/>
+		<item label="笑" name="Laugh"/>
+		<item label="嫌惡貌" name="Plllppt"/>
+		<item label="作噁" name="Repulsed"/>
+		<item label="傷心" name="Sad"/>
+		<item label="聳聳肩" name="Shrug"/>
+		<item label="微笑" name="Smile"/>
+		<item label="驚喜" name="Surprise"/>
+		<item label="眨眼" name="Wink"/>
+		<item label="擔心" name="Worry"/>
 	</combo_box>
 	<text name="preview_label">
 		預覽…
 	</text>
 	<combo_box name="preview_base_anim" tool_tip="用這個來測試你的化身從一般動作轉入動作演繹時的情況。">
-		<item label="站立" name="Standing" value="站立"/>
-		<item label="步行中" name="Walking" value="步行中"/>
-		<item label="坐著" name="Sitting" value="坐著"/>
-		<item label="飛行" name="Flying" value="飛行"/>
+		<item label="站立" name="Standing"/>
+		<item label="步行中" name="Walking"/>
+		<item label="坐著" name="Sitting"/>
+		<item label="飛行" name="Flying"/>
 	</combo_box>
 	<spinner label="淡入（秒）" name="ease_in_time" tool_tip="動作攙混植入的時間長度（秒）"/>
 	<spinner label="淡出（秒）" name="ease_out_time" tool_tip="動作攙混淡出的時間長度（秒）"/>