Merge of viewer2 into avp

--HG--
branch : avatar-pipeline

32 files changed, 673 insertions, 714 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index d0d0cc64c5..e4ab533bc5 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -5,5 +5,6 @@
  name="floater_aaa"
  can_resize="true" 
  width="1024">
+ <string name="Nudge Parabuild">1</string>
   <panel filename="main_view.xml" follows="all" width="1024" height="768" top="0"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 6c4f10e61e..9d2a811d9f 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -3383,6 +3383,16 @@ scratch and wear it.
      bottom="536"
      follows="right|bottom"
      height="20"
+     label="Make Outfit"
+     label_selected="Make Outfit"
+     layout="topleft"
+     name="make_outfit_btn"
+     right="-216"
+     width="100" />
+    <button
+     bottom="536"
+     follows="right|bottom"
+     height="20"
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 452d28d4ea..9e2dbc881f 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -2,66 +2,63 @@
 <floater
  legacy_header_height="18"
  background_visible="true"
- follows="left|top|right|bottom"
- height="369"
+ follows="all"
+ height="350"
  layout="topleft"
  left="0"
  name="panel_im"
- help_topic="panel_im"
  top="0"
  can_dock="true"
- can_minimize="true"
- visible="true" 
- width="520"
+ can_minimize="false"
+ visible="true"
+ width="320"
  can_resize="true"
- min_width="350"
- min_height="369">
-  <layout_stack follows="left|top|right|bottom"
-                height="354"
-                width="520"
+ min_width="300"
+ min_height="350">
+  <layout_stack follows="all"
+                height="350"
+                width="300"
                 layout="topleft"
                 orientation="horizontal"
                 name="im_panels"
-                top="16"
-                left="2">
+                top="20"
+                left="0">
     <layout_panel
       name="panel_im_control_panel"
       layout="topleft"
       top_delta="-3"
-      height="354"
+      height="350"
       follows="left"
       label="IM Control Panel"
       auto_resize="false"
       user_resize="false" />
-    <layout_panel height="354"
-                  width="355"
-                  left_delta="146" 
+    <layout_panel height="350"
+                  width=""
+                  left_delta="110"
                   top="0"
                   user_resize="false">
-      <button height="12"
-      		  follows="left|top"
-              top="8" 
-              label="&lt;&lt;"
+      <button height="20"
+      	      follows="left|top"
+              top="0"
+              image_overlay="TabIcon_Open_Off"
               layout="topleft"
-              width="35"
+              width="25"
               name="slide_left_btn" />
-      <button height="12"
-      		  follows="left|top"
-              top="8"
-              label="&gt;&gt;"
-              layout="topleft"
-              width="35"
+      <button height="20"
+      	      follows="left|top"
+              top="0"
+              image_overlay="TabIcon_Close_Off"
+              width="25"
               name="slide_right_btn" />
       <chat_history
        length="1"
-       follows="left|top|right|bottom"
-       font="SansSerif"
-       height="300"
+       follows="all"
+       height="275"
        layout="topleft"
        name="chat_history"
        parse_highlights="true"
-       allow_html="true" 
-       width="350">
+       allow_html="true"
+       width="160">
       </chat_history>
       <line_editor
        follows="left|right"
@@ -69,7 +66,7 @@
        label="To"
        layout="topleft"
        name="chat_editor"
-       width="345">
+       width="160">
       </line_editor>
     </layout_panel>
   </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 7f58ea132e..4f2d74b417 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  legacy_header_height="18"
- can_minimize="true"
+ can_minimize="false"
  can_tear_off="false"
  can_resize="false"
  can_drag_on_left="false"
@@ -11,7 +11,6 @@
  height="300"
  layout="topleft"
  name="nearby_chat"
- help_topic="nearby_chat"
  save_rect="true"
  title="NEARBY CHAT"
  save_dock_state="true"
@@ -19,19 +18,17 @@
  single_instance="true"
  width="320">
             <chat_history
-             allow_html="true" 
+             allow_html="true"
              bg_readonly_color="ChatHistoryBgColor"
              bg_writeable_color="ChatHistoryBgColor"
              follows="all"
-			 left="1"
+	    left="1"
              top="20"
-             font="SansSerif"
              layout="topleft"
-			 height="280"
+	    height="280"
              name="chat_history"
-             parse_highlights="true" 
+             parse_highlights="true"
              text_color="ChatHistoryTextColor"
              text_readonly_color="ChatHistoryTextColor"
-             width="320"/>
-
+             width="320" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index b2f46bc433..bfbfe7de7c 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -269,6 +269,7 @@
    halign="left"
    left="13"
    name="RenderingCost"
+   tool_tip="Shows the rendering cost calculated for this object"
    top_pad="9"
    type="string"
    width="100">
@@ -306,6 +307,7 @@
      layout="topleft"
      follows="left|top"
      name="combobox grid mode"
+     tool_tip="Choose the type of grid ruler for positioning the object"
      width="108">
         <combo_box.item
          label="World grid"
@@ -329,7 +331,7 @@
      image_unselected="ForwardArrow_Off"
      layout="topleft"
      name="Options..."
-     tool_tip="Grid options"
+     tool_tip="See more grid options"
      top_delta="0"
      right="-10"
      width="18"
@@ -786,7 +788,7 @@
             </panel.string>
             <panel.string
              name="text modify warning">
-                This object has linked parts
+                You must select entire object to set permissions
             </panel.string>
             <panel.string
              name="Cost Default">
@@ -1074,7 +1076,7 @@ even though the user gets a free copy.
              follows="left|top|right"
              layout="topleft"
              name="perm_modify"
-             width="250">
+             width="264">
                 You can modify this object
             </text>
             <text
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index 2c1e2b6dc0..dd3cf079db 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -4,18 +4,18 @@
   Single instance - only have one at a time, recycle it each spawn
 -->
 <floater
- legacy_header_height="18"
+ legacy_header_height="25"
  bevel_style="in"
- bg_opaque_image="Inspector_Background" 
+ bg_opaque_image="Inspector_Background"
  can_close="false"
  can_minimize="false"
- height="138"
+ height="148"
  layout="topleft"
  name="inspect_avatar"
  single_instance="true"
  sound_flags="0"
  visible="true"
- width="245">
+ width="228">
   <!-- Allowed fields include:
 	[BORN_ON] ("12/3/2008")
 	[SL_PROFILE] (Second Life profile),
@@ -30,7 +30,7 @@
   </string>
   <string
      name="Details">
-[ACCTTYPE][COMMA] [PAYMENTINFO]
+[SL_PROFILE]
     </string>
   <string
      name="Partner">
@@ -38,45 +38,45 @@
   </string>
   <text
      follows="all"
-     font="SansSerifLargeBold"
-     height="18"
+     font="SansSerifLarge"
+     height="16"
      left="8"
      name="user_name"
-     top="5"
-     text_color="white"
+     top="10"
+     text_color="White"
      use_ellipses="true"
      value="Grumpity ProductEngine"
-     width="240"
-     word_wrap="false" />
+     width="175" />
     <text
      follows="all"
      height="16"
      left="8"
-     value="Grumpity ProductEngine moose moose"
-     name="user_details"
-     top_pad="0"
-     width="170"
-     use_ellipses="true"
-     word_wrap="false" />
-    <text
-     follows="all"
-   font="SansSerifSmallBold"
+     name="user_subtitle"
+   font="SansSerifSmall"
    text_color="White"
-   height="18"
+     value="11 Months, 3 days old"
+     width="175"
+     use_ellipses="true" />
+     <text
+     follows="all"
+   height="25"
    left="8"
-     name="user_subtitle"
-     use_ellipses="true"
-     top_pad="0"
-     width="170" />
+     name="user_details"
+     word_wrap="true"
+     top_pad="6"
+     width="220">This is my second life description and I really think it is great.
+    </text>
     <text
      follows="all"
-     height="16"
+     height="13"
      left="8"
      name="user_partner"
-     top_pad="8"
-     width="240"
+     top_pad="3"
+     width="220"
      use_ellipses="true"
-     word_wrap="false" />
+     word_wrap="false">
+    Erica Linden
+  </text>
     <slider
      follows="top|left"
      height="23"
@@ -89,15 +89,15 @@
      tool_tip="Voice volume"
      top_pad="0"
      value="0.5"
-     width="150" />
+     width="195" />
     <button
      follows="all"
      height="16"
-     image_disabled="Inv_Sound"
-     image_disabled_selected="Inv_Sound"
-     image_hover_selected="Inv_Sound"
-     image_selected="Inv_Sound"
-     image_unselected="Inv_Sound"
+     image_disabled="Audio_Off"
+     image_disabled_selected="AudioMute_Off"
+     image_hover_selected="AudioMute_Over"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
      is_toggle="true"
      left_pad="0"
      top_delta="4"
@@ -106,67 +106,60 @@
     <avatar_icon
      follows="all"
      height="38"
-     right="-25"
+     right="-10"
      bevel_style="in"
      border_style="line"
      mouse_opaque="true"
      name="avatar_icon"
-     top="24"
+     top="10"
      width="38" />
-    <button
-     follows="top|left"
-     height="18"
-     image_disabled="ForwardArrow_Disabled"
-     image_selected="ForwardArrow_Press"
-     image_unselected="ForwardArrow_Off"
-     layout="topleft"
-     name="view_profile_btn"
-     right="-8"
-     top="35"
-     left_delta="110"
-     tab_stop="false"
-     width="18" />
   <!-- Overlapping buttons for default actions
     llinspectavatar.cpp makes visible the most likely default action -->
     <button
      follows="bottom|left"
-     height="23"
+     height="20"
      label="Add Friend"
      left="8"
-     top="246"
+     top="119"
      name="add_friend_btn"
-     width="100" />
+     width="90" />
     <button
      follows="bottom|left"
-     height="23"
+     height="20"
      label="IM"
      left_delta="0"
      top_delta="0"
      name="im_btn"
-     width="100"
+     width="80"
      commit_callback.function="InspectAvatar.IM"
      />
-    <menu_button
+          <button
      follows="top|left"
-     height="18"
-     image_disabled="OptionsMenu_Disabled"
-     image_selected="OptionsMenu_Press"
-     image_unselected="OptionsMenu_Off"
+     height="20"
+     label="More"
+     layout="topleft"
+     name="view_profile_btn"
+     left_delta="96"
+     top_delta="0"
+     tab_stop="false"
+     width="80" />
+      <!--  gear buttons here -->
+     <menu_button
+     height="20"
+     layout="topleft"
+     image_overlay="OptionsMenu_Off"
      menu_filename="menu_inspect_avatar_gear.xml"
      name="gear_btn"
-     right="-10"
-     top="249"
-     width="18" />
-  <menu_button
-     visible="false" 
+     right="-5"
+     top_delta="0"
+     width="35" />
+         <menu_button
      follows="top|left"
-     height="18"
-     image_disabled="OptionsMenu_Disabled"
-     image_selected="OptionsMenu_Press"
-     image_unselected="OptionsMenu_Off"
+     height="20"
+     image_overlay="OptionsMenu_Off"
      menu_filename="menu_inspect_self_gear.xml"
      name="gear_self_btn"
-     right="-10"
-     top="249"
-     width="18" />
+     right="-5"
+     top_delta="0"
+     width="35" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index 1365a0483f..83570e2528 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -4,48 +4,46 @@
   Single instance - only have one at a time, recycle it each spawn
 -->
 <floater
- legacy_header_height="18"
+ legacy_header_height="25"
  bevel_style="in"
- bg_opaque_image="Inspector_Background" 
+ bg_opaque_image="Inspector_Background"
  can_close="false"
  can_minimize="false"
- height="145"
+ height="148"
  layout="topleft"
  name="inspect_object"
  single_instance="true"
  sound_flags="0"
  visible="true"
- width="300">
+ width="228">
   <string name="Creator">By [CREATOR]</string>
   <string name="CreatorAndOwner">
 by [CREATOR]
 owner [OWNER]
   </string>
-  <!-- *TODO: Might need to change to [AMOUNT] if icon contains "L$" -->
   <string name="Price">L$[AMOUNT]</string>
   <string name="PriceFree">Free!</string>
   <string name="Touch">Touch</string>
   <string name="Sit">Sit</string>
   <text
      follows="all"
-     font="SansSerifLargeBold"
+     font="SansSerifLarge"
      height="16"
      left="8"
      name="object_name"
      text_color="White"
-     top="5"
+     top="10"
      use_ellipses="true"
      value="Test Object Name That Is Really Long"
-     width="291" />
+     width="220" />
   <text
    follows="all"
-   font="SansSerif"
    height="30"
    left="8"
    name="object_creator"
    top_pad="0"
    use_ellipses="true"
-   width="275">
+   width="220">
 by Longavatarname Johnsonlongstonnammer
 owner James Linden
   </text>
@@ -53,32 +51,34 @@ owner James Linden
   <icon
   name="price_icon"
   image_name="Icon_For_Sale"
-  left="7"
+  right="-5"
   width="16"
   height="16"
-  top="52"
+  top="50"
   follows="left|top"
   />
   <text
    follows="all"
-   font="SansSerifSmallBold"
+   font="SansSerifSmall"
+   font.style="BOLD"
    height="16"
-   left_pad="5"
+   halign="right"
+   left="5"
    name="price_text"
    text_color="white"
-   top="54"
+   top="53"
    font_shadow="none"
-   width="150">
+   width="196">
 L$300,000
   </text>
    <text
    follows="all"
-   height="30"
+   font="SansSerifSmall"
+   height="36"
    left="8"
    name="object_description"
    top_pad="0"
-   width="291"
-   use_ellipses="true"
+   width="220"
    word_wrap="true">
 This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really?
   </text>
@@ -86,69 +86,64 @@ This is a really long description for an object being as how it is at least 80 c
   for sale, "Sit" if can sit, etc. -->
    <text
    follows="all"
-   height="15"
+   font="SansSerifSmall"
+   height="13"
    left_delta="0"
    name="object_media_url"
-   top_pad="-5"
+   top_pad="0"
    width="291"
-   max_length = "50" 
-   use_ellipses="true"
-   word_wrap="true"/>   
-    
+   max_length = "50"
+   use_ellipses="true">
+   http://www.superdupertest.com
+</text>
   <button
    follows="top|left"
-   font="SansSerif"
    height="20"
    label="Buy"
-   left="10"
+   left="8"
    name="buy_btn"
-   top="114"
-   width="75" />
+   top="119"
+   width="80" />
   <button
    follows="top|left"
-   font="SansSerif"
    height="20"
    label="Pay"
    left_delta="0"
    name="pay_btn"
    top_delta="0"
-   width="75" />
+   width="80" />
   <button
    follows="top|left"
-   font="SansSerif"
-   height="23"
+   height="20"
    label="Take Copy"
    left_delta="0"
    name="take_free_copy_btn"
    top_delta="0"
-   width="75" />
+   width="80" />
   <button
    follows="top|left"
-   font="SansSerifSmall"
    height="20"
    label="Touch"
    left_delta="0"
    name="touch_btn"
    top_delta="0"
-   width="75" />
+   width="80" />
   <button
    follows="top|left"
-   font="SansSerif"
-   height="23"
+   height="20"
    label="Sit"
    left_delta="0"
    name="sit_btn"
    top_delta="0"
-   width="75" />
+   width="80" />
   <button
    follows="top|left"
-   font="SansSerifSmall"
    height="20"
    label="Open"
    left_delta="0"
    name="open_btn"
    top_delta="0"
-   width="75" />
+   width="80" />
   <icon
    name="secure_browsing"
    image_name="Lock"
@@ -156,33 +151,28 @@ This is a really long description for an object being as how it is at least 80 c
    visible="false"
    width="18"
    height="18"
-   top_delta="2"
+   top_delta="0"
    tool_tip="Secure Browsing"
-   follows="left|top"/> 
-   
+   follows="left|top" />
+
  <!--  non-overlapping buttons here -->
-    <menu_button
-     follows="top|left"
-     height="18"
-     image_disabled="OptionsMenu_Disabled"
-     image_selected="OptionsMenu_Press"
-     image_unselected="OptionsMenu_Off"
-     menu_filename="menu_inspect_object_gear.xml"
-     name="gear_btn"
-     right="-10"
-     top_delta="5"
-     width="18" />
-   <button
+     <button
      follows="top|left"
-     height="18"
-     image_disabled="ForwardArrow_Disabled"
-     image_selected="ForwardArrow_Press"
-     image_unselected="ForwardArrow_Off"
+     height="20"
+     label="More"
      layout="topleft"
      name="more_info_btn"
-     right="-5"
-     top="20"
-     left_delta="110"
+     left_delta="10"
+     top_delta="0"
      tab_stop="false"
-     width="18" />
+     width="80" />
+         <menu_button
+     follows="top|left"
+     height="20"
+     image_overlay="OptionsMenu_Off"
+     menu_filename="menu_inspect_object_gear.xml"
+     name="gear_btn"
+     right="-5"
+     top_delta="0"
+     width="35" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
new file mode 100644
index 0000000000..7b52fecef7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ height="50"
+ layout="topleft"
+ mouse_opaque="false"
+ name="profile_overflow_menu"
+ width="120">
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="pay">
+        <menu_item_call.on_click
+         function="Profile.Pay" />
+    </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e98a6d57bb..181994a1bd 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2572,10 +2572,10 @@
              name="Hover Glow Objects">

                 <menu_item_check.on_check

                  function="CheckControl"

-                 parameter="RenderHighlightEnable" />

+                 parameter="RenderHoverGlowEnable" />

                 <menu_item_check.on_click

                  function="ToggleControl"

-                 parameter="RenderHighlightEnable" />

+                 parameter="RenderHoverGlowEnable" />

             </menu_item_check>

         </menu>

 

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9fe03859bb..56cb54c975 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -581,9 +581,10 @@ Multiple faces are currently selected.
 If you continue this action, separate instances of media will be set on multiple faces of the object.
 To place the media on only one face, choose Select Texture and click on the desired face of that object then click Add.
     <usetemplate
-	 name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
+      ignoretext="Media will be set on multiple selected faces"
+      name="okcancelignore"
+      notext="Cancel"
+      yestext="OK"/>
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
index 0246e21d25..a283cff5b3 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -4,10 +4,9 @@
  height="215"
  name="panel_im_control_panel"
  width="180">
-
     <avatar_list
      color="DkGray2"
-     follows="left|top|right|bottom"
+     follows="all"
      height="130"
      ignore_online_status="true"
      layout="topleft"
@@ -18,11 +17,10 @@
      show_profile_btn="false"
      show_speaking_indicator="false"
      top="10"
-     width="180"/>
-
+     width="180" />
     <panel
      background_visible="true"
-     bg_alpha_color="0.2 0.2 0.2 1"
+     bg_alpha_color="DkGray2"
      border="false"
      bottom="1"
      follows="left|bottom"
@@ -32,32 +30,27 @@
      name="panel_call_buttons"
      top_pad="0"
      width="180">
-
         <button
          bottom="10"
          height="20"
          label="Call"
-         left_delta="28"
+         left_delta="40"
          name="call_btn"
-         width="125"/>
-
+         width="100" />
         <button
          bottom="40"
          height="20"
          label="Leave Call"
          name="end_call_btn"
          visible="false"
-         width="125"/>
-
+         width="100" />
         <button
          enabled="false"
          bottom="10"
          height="20"
-         label="Open Voice Controls"
+         label="Voice Controls"
          name="voice_ctrls_btn"
          visible="false"
-         width="125"/>
-
+         width="100" />
     </panel>
-
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
index 16c8660781..b779b08a63 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
@@ -4,66 +4,63 @@
  top="10"
  width="250"
  height="100"
- background_opaque="false"
- background_visible="true"
- follows="left|top|bottom|right"
- bg_alpha_color="0.3 0.3 0.3 1.0">
-	<panel 
-     width="250" 
-     height="30" 
-     background_visible="true" 
-     background_opaque="false" 
+ follows="all">
+  <panel
+     width="240"
+     height="24"
+     left="5"
+     background_visible="true"
+     background_opaque="false"
      follows="left|top|right"
-     bg_alpha_color="0.0 0.0 0.0 1.0" 
+     top="-5"
+     bg_alpha_color="black"
      name="msg_caption">
-  		<avatar_icon
-         top="-7" 
-         left="10" 
-         width="20" 
-         height="20" 
+  	<avatar_icon
+         top="-3"
+         left="3"
+         width="18"
+         image_name="Generic_Person"
+         height="18"
          follows="left|top"
-         color="1 1 1 1" 
-         enabled="true" 
-         name="avatar_tag_icon"/>
+         enabled="true"
+         name="avatar_tag_icon" />
     	<text
-         width="160" 
-         top="-10" 
-         left="40" 
-         height="20" 
+         width="160"
+         top="-8"
+         left="30"
+         height="20"
          follows="left|right|top"
-         font="SansSerifBigBold" 
-         text_color="white" 
+	 font.style="BOLD"
+         text_color="white"
          word_wrap="true"
-         mouse_opaque="true" 
-         name="sender_tag_name" >
+         mouse_opaque="true"
+         name="sender_tag_name">
 	      Angela Tester
     	</text>
-    	<text 
-         width="30" 
-         top="-12" 
-         left="210" 
-         height="20" 
-         follows="right|top"
-         text_color="white" 
-         word_wrap="true" 
-         mouse_opaque="true" 
-         name="tag_time" >
-      		07:52
-		</text>
+	<text
+        font="SansSerifSmall"
+         follows="right"
+         height="13"
+         layout="topleft"
+	 halign="right"
+         right="-5"
+         name="tag_time"
+         top="8"
+         value="23:30"
+         width="50" />
 	</panel>
-	<text_editor
-     top="65" 
-     left="10" 
-     right="-10" 
-     height="100" 
-     follows="left|top|bottom|right"
-     font="SansSerifSmall" 
+ <text_editor
+ bg_readonly_color="DkGray"
+     font="SansSerifSmall"
+     top="65"
+     left="5"
+     right="-5"
+     height="100"
+     follows="all"
      read_only="true"
-     bg_readonly_color="0 0 0 0"
      word_wrap="true"
-     mouse_opaque="true" 
-     name="msg_text" >
+     mouse_opaque="true"
+     name="msg_text">
      The quick brown fox jumps over the lazy dog.
     </text_editor>
 </panel>
-
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 64519b2571..323ee957e7 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -1,44 +1,46 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- background_visible="true"
- bevel_style="in"
- bg_alpha_color="black"
- follows="left|top|right"
- height="20"
+      background_visible="true"
+     bevel_style="in"
+     bg_alpha_color="black"
+     follows="top"
+     height="24"
  label="im_header"
  layout="topleft"
- name="im_header" >
-    <avatar_icon
-     follows="left"
-     height="16"
-     image_name="icon_avatar_online.tga"
-     layout="topleft"
-     left="2"
-     mouse_opaque="true"
-     name="avatar_icon"
-     top="2"
-     width="16" />
+ name="im_header"
+ width="300">
+             <avatar_icon
+         follows="left"
+         height="18"
+         image_name="Generic_Person"
+         layout="topleft"
+         left="3"
+         mouse_opaque="true"
+         name="avatar_icon"
+         top="3"
+         width="18" />
     <text
      follows="left|right"
-     font="SansSerifBigBold"
-     height="20"
-     layout="topleft"
-     left_pad="6"
+      font.style="BOLD"
+         height="12"
+         layout="topleft"
+         left_pad="5"
      right="-50"
      name="user_name"
      text_color="white"
-     top="3"
-     value="Darth Vader"
-     use_ellipses="true" />
+         top="8"
+         use_ellipses="true"
+         value="Erica Vader" />
     <text
-     follows="right"
-     font="SansSerifBig"
-     height="20"
-     layout="topleft"
+            font="SansSerifSmall"
+         follows="right"
+         halign="right"
+         height="13"
+         layout="topleft"
+         left_pad="5"
      name="time_box"
-     right="0"
-     text_color="white"
-     top="3"
-     value="23:30"
-     width="50" />
+     right="-10"
+     top="8"
+         value="23:30"
+         width="50" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
index 05b04bbf8e..01917052d1 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -1,38 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- All our XML is utf-8 encoded. -->
-
 <panel
   name="instant_message"
   width="300"
   height="180"
-  background_opaque="true"
-  background_visible="false"
-  follows="left|top|right|bottom"
-  bg_alpha_color="0.3 0.3 0.3 0">
-	<panel width="250" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="msg_caption">
-  		<avatar_icon
-      		top="25" left="10" width="20" height="20" follows="left|top"
-      		color="1 1 1 1" enabled="true" name="avatar_icon"
-		  />
+  follows="all">
+	<panel
+	width="290"
+	height="24"
+	background_visible="true"
+	background_opaque="false"
+	bg_alpha_color="Black"
+	left="5"
+	name="msg_caption">
+             <avatar_icon
+         follows="left"
+         height="18"
+         image_name="Generic_Person"
+         layout="topleft"
+         left="3"
+         mouse_opaque="true"
+         name="avatar_icon"
+         top="3"
+         width="18" />
     	<text
-        	width="130" top="25" left="40" height="20" follows="left|right|top"
-        	font="SansSerifBigBold" text_color="white" word_wrap="false" use_ellipses="true"
-        	mouse_opaque="true" name="sender_name" >
+                font.style="BOLD"
+                height="12"
+	    layout="topleft"
+	    left_pad="5"
+	    top="7"
+		text_color="white"
+		word_wrap="false"
+		use_ellipses="true"
+        	mouse_opaque="true"
+		name="sender_name"
+        	width="175">
 	      Jerry Knight
     	</text>
-    	<icon top="22" left="170" width="15" height="15" follows="top|right"
-      		image_name="icn_voice-pvtfocus.tga" visible="false" name="msg_inspector"/>
-    	<icon top="22" left="190" width="10" height="10" follows="top|right"
-      		image_name="speaking_indicator.tga"	name="msg_icon"/>
-    	<text width="35" top="22" left="205" height="20" follows="right|top"
-        		text_color="white" word_wrap="true" mouse_opaque="true" name="msg_time" >
-      		10:32
-		</text>
+   <!-- 	<icon top="22" left="170" width="15" height="15" follows="top|right"
+      		image_name="icn_voice-pvtfocus.tga" visible="false" name="msg_inspector" />-->
+    	<!--<icon top="22" left="190" width="10" height="10" follows="top|right"
+      		image_name="speaking_indicator.tga"	name="msg_icon"/>-->
+	 <text
+            font="SansSerifSmall"
+         follows="right|top"
+	 halign="right"
+         height="13"
+         layout="topleft"
+         right="-10"
+	 left="205"
+	 mouse_opaque="true"
+      name="msg_time"
+        top="8"
+         value="23:30"
+         width="50"
+	 word_wrap="true" />
 	</panel>
 	<text_chat
-      top="-35" left="10" right="-10" height="120" follows="left|right|bottom"
-      font="SansSerifSmall" text_color="white" word_wrap="true"
-      mouse_opaque="true" name="msg_text" >    
+      top="-35"
+      left="10"
+      right="-10"
+      height="120"
+      follows="left|right|bottom"
+      text_color="white"
+      word_wrap="true"
+      mouse_opaque="true"
+      name="msg_text">
+      To be or not to be, that is the question. Tis a far far better thing I do than I have ever done. Tis a far far better place I go, than I have ever been.
 	</text_chat>
 </panel>
-
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index e81532ec3e..9573904c93 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -1,101 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="false"
- height="350"
+ height="300"
  name="panel_im_control_panel"
- width="131">
-
+ width="110">
     <avatar_icon
      follows="left|top"
-     height="125"
-     left_delta="3"
+     height="100"
+     left_delta="5"
      name="avatar_icon"
-     top="-10"
-     width="125"/>
-
+     top="-5"
+     width="100"/>
     <text
      follows="top|left|right"
-     font="SansSerifBig"
-     height="16"
+     font="SansSerifLarge"
+     height="22"
      layout="topleft"
      name="avatar_name"
      use_ellipses="true"
      value="Unknown"
-     width="125" />
-
+     width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
-     label="View Profile"
+     label="Profile"
      name="view_profile_btn"
-     width="125"/>
-
+     width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
      label="Add Friend"
      name="add_friend_btn"
-     width="125"/>
-
+     width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
      label="Teleport"
      name="teleport_btn"
-     width="125"/>
-
+     width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
      label="Share"
      name="share_btn"
-     width="125"/>
-
+     width="100" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="20"
      label="Pay"
      name="pay_btn"
-     width="125"/>
-
+     width="100" />
     <panel
      background_visible="true"
-     bg_alpha_color="0.2 0.2 0.2 1"
+     bg_alpha_color="DkGray2"
      border="false"
-     bottom="1"
-     follows="left|bottom"
+     follows="left|top"
      height="70"
      left="0"
      left_pad="0"
      name="panel_call_buttons"
-     top_pad="0"
-     width="131">
-
+     width="110">
         <button
          bottom="10"
          height="20"
          label="Call"
-         left_delta="3"
+         left_delta="5"
          name="call_btn"
-         width="125"/>
-
+         width="100" />
         <button
-         bottom="40"
+         bottom="35"
          height="20"
          label="Leave Call"
          name="end_call_btn"
          visible="false"
-         width="125"/>
-
+         width="100" />
         <button
          enabled="false"
          bottom="10"
          height="20"
-         label="Open Voice Controls"
+         label="Voice Controls"
          name="voice_ctrls_btn"
          visible="false"
-         width="125"/>
-
+         width="100" />
     </panel>
-
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index be56866119..1e570bf207 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
- bg_alpha_color="0.3 0.3 0.3 0"
  height="175"
  label="im_panel"
  layout="topleft"
@@ -18,7 +17,7 @@
      bevel_style="in"
      bg_alpha_color="black"
      follows="top"
-     height="20"
+     height="24"
      label="im_header"
      layout="topleft"
      left="5"
@@ -27,52 +26,53 @@
      width="295">
         <avatar_icon
          follows="right"
-         height="20"
-         image_name="icon_avatar_online.tga"
+         height="18"
+         image_name="Generic_Person"
          layout="topleft"
-         left="0"
+         left="3"
          mouse_opaque="true"
          name="avatar_icon"
-         top="0"
-         width="20" />
-        <icon
+         top="3"
+         width="18" />
+        <!--<icon
          follows="right"
          height="20"
-         image_name="icon_top_pick.tga"
+         image_name=""
          layout="topleft"
-         left="0"
+         left="3"
          mouse_opaque="true"
          name="sys_msg_icon"
          top="0"
-         width="20" />
+         width="20" />-->
         <text
          follows="left|right"
-         font="SansSerifBold"
-         height="20"
+         font.style="BOLD"
+         height="12"
          layout="topleft"
          left_pad="5"
          name="user_name"
          text_color="white"
-         top="5"
-         value="Darth Vader"
-         width="295" />
+         top="8"
+         use_ellipses="true"
+         value="Erica Vader"
+         width="212" />
 	 <!-- TIME STAMP -->
         <text
+        font="SansSerifSmall"
          follows="right"
-         font="SansSerif"
-         height="20"
+         height="13"
          layout="topleft"
 	 halign="right"
-         left="245"
+         right="-5"
          name="time_box"
-         text_color="white"
-         top="5"
+         top="8"
          value="23:30"
          width="50" />
     </panel>
     <text
-     follows="left|top|bottom|right"
-     height="86"
+        font="SansSerifSmall"
+     follows="all"
+     height="97"
      layout="topleft"
      left="10"
      name="message"
@@ -85,12 +85,11 @@
      max_length="350" />
     <button
      follows="bottom"
-     font="SansSerifBold"
-     height="25"
+     height="23"
      label="Reply"
      layout="topleft"
-     left="97"
+     left="100"
      name="reply"
-     top="137"
-     width="110" />
+     top="144"
+     width="100" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index cb5ec15387..a9a02e8fc7 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -27,6 +27,7 @@
      border_visible="false"
      bottom="600"
      follows="all"
+	 hide_loading="true"
      left="0"
      name="login_html"
      start_url=""
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 9fac7d34f7..a370b450e9 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -107,7 +107,10 @@ background_visible="true"
                  name="add_friend_btn"
                  top_delta="0"
                  tool_tip="Add selected resident to your friends List"
-                 width="18" />
+                 width="18">
+               <commit_callback
+                  function="People.addFriend" />
+             </button>
             </panel>
         </panel>
         <panel
@@ -325,7 +328,10 @@ background_visible="true"
                  name="add_friend_btn"
                  top_delta="0"
                  tool_tip="Add selected resident to your friends List"
-                 width="18" />
+                 width="18">
+                <commit_callback
+                   function="People.addFriend" />
+              </button>
             </panel>
         </panel>
     </tab_container>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 7ff227ecb6..023b1fc81d 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -12,24 +12,24 @@
      follows="all"
      height="85"
      image_name="ListItem_Over"
-     right="-3"
+     right="-2"
      mouse_opaque="false"
      name="hovered_icon"
      top="1"
      scale_image="true"
      visible="false"
-     width="307"/>
+     width="308" />
     <icon
      follows="all"
      height="85"
      image_name="ListItem_Select"
-     right="-3"
+     right="-2"
      mouse_opaque="false"
      name="selected_icon"
      top="1"
      scale_image="true"
      visible="false"
-     width="307"/>
+     width="308" />
     <texture_picker
      allow_no_texture="true"
      border_enabled="true"
@@ -47,36 +47,34 @@
      width="90" />
     <text
      follows="top|left|right"
-     font="SansSerifSmallBold"
-     height="16"
+     font="SansSerifSmall"
+     height="15"
      layout="topleft"
      left="110"
      name="picture_name"
      text_color="white"
      top="9"
-     use_ellipses="false"
-     width="197"
+     use_ellipses="true"
+     width="193"
      word_wrap="false" />
     <expandable_text
      follows="top|left|right"
      font="SansSerifSmall"
-     height="40"
+     height="55"
      layout="topleft"
-     left="110"
+     left="103"
      name="picture_descr"
-     top_pad="3"
+     top_pad="0"
      width="178"
      word_wrap="true" />
-    <button
-     follows="top|right"
-     height="16"
-     image_selected="BuyArrow_Press"
-     image_pressed="BuyArrow_Press"
-     image_unselected="BuyArrow_Press"
+         <button
+     follows="right"
+     height="20"
+     image_overlay="ForwardArrow_Off"
      layout="topleft"
+     left_pad="5"
+     right="-8"
      name="info_chevron"
-     right="-7"
-     tab_stop="false"
-     top="27"
-     width="16" />
+     top_delta="15"
+     width="20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index a6ca73d4b7..6bb937e3c6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -66,11 +66,7 @@
          label="Italiano (Italian) - Beta"
          name="Italian"
          value="it" />
-        <combo_box.item
-         enabled="true"
-         label="Magyar (Hungarian) - Beta"
-         name="Hungarian"
-         value="hu" />
+
         <combo_box.item
          enabled="true"
          label="Nederlands (Dutch) - Beta"
@@ -86,36 +82,16 @@
          label="Portugués (Portuguese) - Beta"
          name="Portugese"
          value="pt" />
-        <combo_box.item
-         enabled="true"
-         label="Русский (Russian) - Beta"
-         name="Russian"
-         value="ru" />
-        <combo_box.item
-         enabled="true"
-         label="Türkçe (Turkish) - Beta"
-         name="Turkish"
-         value="tr" />
-        <combo_box.item
-         enabled="true"
-         label="Українська (Ukrainian) - Beta"
-         name="Ukrainian"
-         value="uk" />
-        <combo_box.item
-         enabled="true"
-         label="中文 (简体) (Chinese) - Beta"
-         name="Chinese"
-         value="zh" />
+
+
+
+
         <combo_box.item
          enabled="true"
          label="日本語 (Japanese) - Beta"
          name="(Japanese)"
          value="ja" />
-        <combo_box.item
-         enabled="true"
-         label="한국어 (Korean) - Beta"
-         name="(Korean)"
-         value="ko" />
+
         <combo_box.item
          enabled="true"
          label="Test Language"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 9b10edde33..eb00b9b79a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -16,81 +16,8 @@
      height="12"
      layout="topleft"
      left="30"
-     name="WindowSizeLabel"
-     top="10"
-     width="300">
-        Window size:
-    </text>
-    <check_box
-     control_name="WindowFullScreen"
-     height="16"
-     label="Use fullscreen"
-     layout="topleft"
-     left_delta="50"
-     name="windowed mode"
-     top_pad="4"
-     width="175">
-    </check_box>
-	<combo_box
-	 visiblity_control="WindowFullScreen"
-	 allow_text_entry="false"
-	 enabled="true"
-	 layout="topleft"
-	 height="18"
-	 left_delta="220"
-	 max_chars="20"
-	 mouse_opaque="true"
-	 name="windowsize combo"
-	 top_delta="-1"
-	 width="150">
-		<combo_box.item
-		 type="string"
-	     length="1"
-	     enabled="true"
-	     name="640x480"
-	     value="640 x 480"
-	     label="640x480"/>
-	    <combo_box.item
-	     type="string"
-	     length="1"
-	     enabled="true"
-	     name="800x600"
-	     value="800 x 600"
-	     label="800x600"/>
-	    <combo_box.item
-	     type="string"
-	     length="1"
-	     enabled="true"
-	     name="720x480"
-	     value="720 x 480"
-	     label="720x480 (NTSC)"/>
-	    <combo_box.item
-	     type="string"
-	     length="1"
-	     enabled="true"
-	     name="768x576"
-	     value="768 x 576"
-	     label="768x576 (PAL)"/>
-	    <combo_box.item
-	     type="string"
-	     length="1"
-	     enabled="true"
-	     name="1024x768"
-	     value="1024 x 768"
-	     label="1024x768"/>
-	    <combo_box.commit_callback
-	     function="Pref.setControlFalse"
-	     parameter="FullScreenAutoDetectAspectRatio" />
- 	</combo_box>
-	<text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="30"
      name="UI Size:"
-     top_pad="4"
+     top="10"
      width="300">
         UI size:
     </text>
@@ -101,7 +28,7 @@
      follows="left|top"
      height="15"
      increment="0.025"
-     initial_value="1"
+     initial_valu="1"
      layout="topleft"
      left_delta="52"
      max_val="1.4"
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 9cf0bd26d8..5cabae5fa0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -169,12 +169,12 @@
      decimal_digits="0"
      follows="left|top"
      height="15"
-     increment="10"
-     initial_value="50"
+     increment="16"
+     initial_value="512"
      layout="topleft"
      left_delta="150"
-     max_val="1000"
-     min_val="10"
+     max_val="1024"
+     min_val="32"
      name="cache_size"
      top_delta="-1"
      width="180" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index d454b9e5c8..8ef2cdfc37 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -350,7 +350,7 @@
      border="false"
      follows="top|left"
      height="145"
-     label="DeviceSettings"
+     label="Device Settings"
      layout="topleft"
      left="0"
      name="device_settings_panel"
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 70c5d7b823..98025e28db 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -77,10 +77,14 @@
 		width="22"
 		top="4">
 	  <button
+		  image_overlay="Arrow_Left_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  auto_resize="false"
 		  height="22"
-		  image_selected="media_btn_back.png"
-		  image_unselected="media_btn_back.png"
 		  layout="topleft"
 		  tool_tip="Step back"
 		  width="22"
@@ -96,37 +100,25 @@
 		user_resize="false"
 		layout="topleft"
 		top="10"
-		min_width="17"
-		width="17">
+		min_width="22"
+		width="22">
 	  <button
+		  image_overlay="Arrow_Right_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  height="22"
-		  image_selected="media_btn_forward.png"
-		  image_unselected="media_btn_forward.png"
 		  layout="topleft"
 		  tool_tip="Step forward"
 		  top_delta="0"
-		  min_width="17"
-		  width="17">
+		  min_width="22"
+		  width="22">
 		<button.commit_callback
 			function="MediaCtrl.Forward" />
 	  </button>
 	</layout_panel>
-	<!--
-		<panel
-		height="22"
-		layout="topleft"
-		auto_resize="false"
-		min_width="3"
-		width="3">
-		<icon
-		height="22"
-		image_name="media_panel_divider.png"
-		layout="topleft"
-		top="0"
-		min_width="3"
-		width="3" />
-		</panel>
-	-->
 	<layout_panel
 		name="home"
 		auto_resize="false"
@@ -136,11 +128,15 @@
 		min_width="22"
 		width="22">
 	  <button
-		  height="22"
-		  image_selected="media_btn_home.png"
-		  image_unselected="media_btn_home.png"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_overlay="Home_Off"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip="Home page"
+		  height="22"
 		  min_width="22"
 		  width="22">
 		<button.commit_callback
@@ -155,10 +151,15 @@
 		top="2"
 		min_width="22"
 		width="22">
+	  <!-- The stop button here is temporary artwork -->
 	  <button
+		  image_overlay="media_btn_stoploading.png"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  height="22"
-		  image_selected="button_anim_stop.tga"
-		  image_unselected="button_anim_stop.tga"
 		  layout="topleft"
 		  tool_tip="Stop media"
 		  min_width="22"
@@ -167,22 +168,6 @@
 			function="MediaCtrl.Stop" />
 	  </button>
 	</layout_panel>
-	<!--
-		<panel
-		height="22"
-		layout="topleft"
-		auto_resize="false"
-		min_width="3"
-		width="3">
-		<icon
-		height="22"
-		image_name="media_panel_divider.png"
-		layout="topleft"
-		top="0"
-		min_width="3"
-		width="3" />
-		</panel>
-	-->
 	<layout_panel
 		name="reload"
 		auto_resize="false"
@@ -193,8 +178,12 @@
 		width="22">
 	  <button
 		  height="22"
-		  image_selected="media_btn_reload.png"
-		  image_unselected="media_btn_reload.png"
+		  image_overlay="Refresh_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip="Reload"
 		  min_width="22"
@@ -213,8 +202,12 @@
 		width="22">
 	  <button
 		  height="22"
-		  image_selected="media_btn_stoploading.png"
-		  image_unselected="media_btn_stoploading.png"
+		  image_overlay="StopReload_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip = "Stop loading"
 		  min_width="22"
@@ -232,11 +225,15 @@
 		min_width="22"
 		width="22">
 	  <button
-		  height="22"
-		  image_selected="button_anim_play.tga"
-		  image_unselected="button_anim_play.tga"
+		  image_overlay="Play_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip = "Play media"
+		  height="22"
 		  min_width="22"
 		  width="22">
 		<button.commit_callback
@@ -252,10 +249,14 @@
 		min_width="22"
 		width="22">
 	  <button
-		  height="22"
-		  image_selected="button_anim_pause.tga"
-		  image_unselected="button_anim_pause.tga"
+		  image_overlay="Pause_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  layout="topleft"
+		  height="22"
 		  tool_tip = "Pause media">
 		<button.commit_callback
 			function="MediaCtrl.Pause" />
@@ -266,7 +267,7 @@
 		name="media_address"
 		auto_resize="true"
 		user_resize="false"
-		height="22"
+		height="24"
 		follows="left|right|bottom"
 		layout="topleft"
 		width="190"
@@ -313,7 +314,7 @@ function="MediaCtrl.CommitURL" />
 			  name="media_whitelist_flag"
 			  follows="top|right"
 			  height="16"
-			  image_name="smicon_warn.tga"
+			  image_name="Flag"
 			  layout="topleft"
 			  tool_tip="White List enabled"
 			  min_width="16"
@@ -327,7 +328,7 @@ function="MediaCtrl.CommitURL" />
 		  <icon
 			  name="media_secure_lock_flag"
 			  height="16"
-			  image_name="icon_lock.tga"
+			  image_name="Lock2"
 			  layout="topleft"
 			  tool_tip="Secured Browsing"
 			  min_width="16"
@@ -351,6 +352,7 @@ function="MediaCtrl.CommitURL" />
 		  initial_value="0.5"
 		  layout="topleft"
 		  tool_tip="Movie play progress"
+		  top="8"
 		  min_width="100"
 		  width="200">
 		<slider_bar.commit_callback
@@ -362,43 +364,55 @@ function="MediaCtrl.CommitURL" />
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		height="24"
-		min_width="24"
-		width="24">
+		height="22"
+		min_width="22"
+		width="22">
+	  <!-- Note: this isn't quite right either...the mute button is not the -->
+	  <!-- same as the others because it can't have the "image_overlay" be  -->
+	  <!-- two different images.  -->
 	  <button
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="AudioMute_Off"
+		  image_unselected="Audio_Off"
+		  hover_glow_amount="0.15"
 		  name="media_volume_button"
 		  height="22"
-		  image_selected="icn_speaker-muted_dark.tga"
-		  image_unselected="icn_speaker_dark.tga"
 		  is_toggle="true"
 		  layout="topleft"
 		  scale_image="false" 
 		  tool_tip="Mute This Media"
-		  top_delta="22"
-		  min_width="24"
-		  width="24" >
+		  top_delta="18"
+		  min_width="22"
+		  width="22" >
 		<button.commit_callback
 			function="MediaCtrl.ToggleMute" />
 	  </button>
 	</layout_panel>
+	<!-- We don't have a design yet for "volume", so this is a temporary -->
+	<!-- solution.  See DEV-42827. -->
 	<layout_panel
 		name="volume_up"
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		min_width="20"
+		min_width="14"
 		height="14"
-		width="20">
+		width="14">
 	  <button
-		  top="-3"
+		  image_overlay="media_btn_scrollup.png"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  top="-5"
 		  height="14"
-		  image_selected="media_btn_scrollup.png"
-		  image_unselected="media_btn_scrollup.png"
 		  layout="topleft"
 		  tool_tip="Volume up"
 		  scale_image="true"
-		  min_width="20"
-		  width="20" >
+		  min_width="14"
+		  width="14" >
 		<button.commit_callback
 			function="MediaCtrl.CommitVolumeUp" />
 	  </button>
@@ -408,27 +422,33 @@ function="MediaCtrl.CommitURL" />
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
-		min_width="20"
+		min_width="14"
 		height="14"
-		width="20">
+		width="14">
 	  <button
-		  top="-5"
-		  height="14"
-		  image_selected="media_btn_scrolldown.png"
-		  image_unselected="media_btn_scrolldown.png"
+		  image_overlay="media_btn_scrolldown.png"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  layout="topleft"
 		  tool_tip="Volume down"
 		  scale_image="true"
-		  min_width="20"
-		  width="20">
+		  top="-5"
+		  height="14"
+		  min_width="14"
+		  width="14">
 		<button.commit_callback
 			function="MediaCtrl.CommitVolumeDown" />
 	  </button>
 	</layout_panel>
 	<!-- Scroll pad -->
+	<!-- This was removed from the design, but is still here because it is --> 
+	<!-- complex, and recreating it would be hard.  In case the design -->
+	<!-- changes, here it lies: --> 
 	<!--
-		disabled
-		<layout_panel
+	<layout_panel
 		name="media_panel_scroll"
 		auto_resize="false"
 		user_resize="false"
@@ -437,64 +457,77 @@ function="MediaCtrl.CommitURL" />
 		layout="topleft"
 		min_width="32"
 		width="32">
-		<icon
-		height="32"
-		image_name="media_panel_scrollbg.png"
-		layout="topleft"
-		top="0"
-		min_width="32"
-		width="32" />
-		<button
-		name="scrollup"
-		height="8"
-		image_selected="media_btn_scrollup.png"
-		image_unselected="media_btn_scrollup.png"
-		layout="topleft"
-		tool_tip="Scroll up"
-		scale_image="false"
-		left="12"
-		top_delta="4"
-		min_width="8"
-		width="8" />
-		<button
-		name="scrollleft"
-		height="8"
-		image_selected="media_btn_scrollleft.png"
-		image_unselected="media_btn_scrollleft.png"
-		layout="topleft"
-		left="3"
-		tool_tip="Scroll left"
-		scale_image="false"
-		top="12"
-		min_width="8"
-		width="8" />
-		<button
-		name="scrollright"
-		height="8"
-		image_selected="media_btn_scrollright.png"
-		image_unselected="media_btn_scrollright.png"
-		layout="topleft"
-		left_pad="9"
-		tool_tip="Scroll right"
-		scale_image="false"
-		top_delta="0"
-		min_width="8"
-		width="8" />
-		<button
-		name="scrolldown"
-		height="8"
-		image_selected="media_btn_scrolldown.png"
-		image_unselected="media_btn_scrolldown.png"
-		layout="topleft"
-		left="12"
-		tool_tip="Scroll down"
-		scale_image="false"
-		top="20"
-		min_width="8"
-		width="8" />
-		</layout_panel>
-		disabled
+	  <icon
+		  height="32"
+		  image_name="media_panel_scrollbg.png"
+		  layout="topleft"
+		  top="0"
+		  min_width="32"
+		  width="32" />
+	  <button
+		  name="scrollup"
+		  height="8"
+		  image_selected="media_btn_scrollup.png"
+		  image_unselected="media_btn_scrollup.png"
+		  layout="topleft"
+		  tool_tip="Scroll up"
+		  scale_image="false"
+		  left="12"
+		  top_delta="4"
+		  min_width="8"
+		  width="8" />
+	  <button
+		  name="scrollleft"
+		  height="8"
+		  image_selected="media_btn_scrollleft.png"
+		  image_unselected="media_btn_scrollleft.png"
+		  layout="topleft"
+		  left="3"
+		  tool_tip="Scroll left"
+		  scale_image="false"
+		  top="12"
+		  min_width="8"
+		  width="8" />
+	  <button
+		  name="scrollright"
+		  height="8"
+		  image_selected="media_btn_scrollright.png"
+		  image_unselected="media_btn_scrollright.png"
+		  layout="topleft"
+		  left_pad="9"
+		  tool_tip="Scroll right"
+		  scale_image="false"
+		  top_delta="0"
+		  min_width="8"
+		  width="8" />
+	  <button
+		  name="scrolldown"
+		  height="8"
+		  image_selected="media_btn_scrolldown.png"
+		  image_unselected="media_btn_scrolldown.png"
+		  layout="topleft"
+		  left="12"
+		  tool_tip="Scroll down"
+		  scale_image="false"
+		  top="20"
+		  min_width="8"
+		  width="8" />
+	</layout_panel>
 	-->
+	<panel
+		height="28"
+		layout="topleft"
+		auto_resize="false"
+		min_width="3"
+		width="3">
+	  <icon
+		  height="26"
+		  image_name="media_panel_divider.png"
+		  layout="topleft"
+		  top="0"
+		  min_width="3"
+		  width="3" />
+	</panel>
 	<layout_panel
 		name="zoom_frame"
 		auto_resize="false"
@@ -504,9 +537,13 @@ function="MediaCtrl.CommitURL" />
 		min_width="22"
 		width="22">
 	  <button
+		  image_overlay="Zoom_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  height="22"
-		  image_selected="media_btn_optimalzoom.png"
-		  image_unselected="media_btn_optimalzoom.png"
 		  layout="topleft"
 		  tool_tip="Zoom into media"
 		  min_width="22"
@@ -522,10 +559,15 @@ function="MediaCtrl.CommitURL" />
 		layout="topleft"
 		min_width="21"
 		width="21" >
+	  <!-- There is no "Zoom out" icon, so we use this temporarily -->
 	  <button
+		  image_overlay="ForwardArrow_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  height="22"
-		  image_selected="media_btn_done.png"
-		  image_unselected="media_btn_done.png"
 		  layout="topleft"
 		  tool_tip ="Zoom Back"
 		  top_delta="-4"
@@ -534,22 +576,6 @@ function="MediaCtrl.CommitURL" />
 			function="MediaCtrl.Close" />
 	  </button>
 	</layout_panel>
-	<!--
-		<panel
-		height="22"
-		layout="topleft"
-		auto_resize="false"
-		min_width="3"
-		width="3">
-		<icon
-		height="22"
-		image_name="media_panel_divider.png"
-		layout="topleft"
-		top="0"
-		min_width="3"
-		width="3" />
-		</panel>
-	-->
 	<layout_panel
 		name="new_window"
 		auto_resize="false"
@@ -558,34 +584,22 @@ function="MediaCtrl.CommitURL" />
 		min_width="22"
 		width="22">
 	  <button
+		  image_overlay="ExternalBrowser_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
 		  height="22"
-		  image_selected="media_btn_newwindow.png"
-		  image_unselected="media_btn_newwindow.png"
 		  layout="topleft"
 		  tool_tip = "Open URL in browser"
-		  top_delta="-3"
+		  top_delta="-4"
 		  min_width="24"
 		  width="24" >
 		<button.commit_callback
 			function="MediaCtrl.Open" />
 	  </button>
 	</layout_panel>
-	<!--
-		<panel
-		height="22"
-		layout="topleft"
-		auto_resize="false"
-		min_width="3"
-		width="3">
-		<icon
-		height="22"
-		image_name="media_panel_divider.png"
-		layout="topleft"
-		top="0"
-		min_width="3"
-		width="3" />
-		</panel>
-	-->
 	<!-- bookend panel -->
 	<layout_panel
 		name="right_bookend"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 0f5e96416d..5110b6b2ef 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -283,7 +283,7 @@
          mouse_opaque="false"
          name="add_friend"
          top="5"
-         width="75" />
+         width="76" />
         <button
          follows="bottom|left"
          height="19"
@@ -292,7 +292,7 @@
          name="im"
          top="5"
          left_pad="5"
-         width="45" />
+         width="31" />
         <button
          follows="bottom|left"
          height="19"
@@ -301,7 +301,7 @@
          name="call"
          left_pad="5"
          top="5"
-         width="45" />
+         width="40" />
         <button
          enabled="false"
          follows="bottom|left"
@@ -311,7 +311,7 @@
          name="show_on_map_btn"
          top="5"
          left_pad="5"
-         width="45" />
+         width="42" />
         <button
          follows="bottom|left"
          height="19"
@@ -320,7 +320,17 @@
          name="teleport"
          left_pad="5"
          top="5"
-         width="80" />
+         width="64" />
+        <button
+         follows="bottom|right"
+         font="SansSerifSmall"
+         height="19"
+         label="▼"
+         layout="topleft"
+         name="overflow_btn"
+         right="-1"
+         top="5"
+         width="21" />
  </panel>
  <panel
      follows="bottom|left"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index d87211d432..2ce156cfda 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -11,7 +11,7 @@
 	  width="333">
      <string
 		 name="looks_tab_title"
-		 value="Looks" />
+		 value="Outfits" />
      <panel
 		 left="5" width="320" height="55"
 		 background_visible="true"
@@ -23,13 +23,13 @@
 			 top="-5" width="200" left="5" height="10" follows="left|right|top"
         	 font="SansSerif" text_color="LtGray" word_wrap="true"
         	 mouse_opaque="false" name="currentlook_title">
-					Current Look
+					Current Outfit
     	</text>
   		<text
 			 top="-30" left="8" height="10" follows="left|right|top"
       		 font="SansSerifBold" text_color="white" word_wrap="true"
       		 mouse_opaque="false" name="currentlook_name" >
-					MyLook
+					MyOutfit
   		</text>
   	    <button
   	     	 follows="left|right|top"
@@ -74,7 +74,7 @@
     	 follows="bottom|left"
   	     font="SansSerifSmallBold"
   	     height="25"
-  	     label="New Look"
+  	     label="New Outfit"
   	     layout="topleft"
   	     left_pad="0"
   	     name="newlook_btn"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 761c17cfd2..a5272d1883 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1747,10 +1747,10 @@ Clears (deletes) the media and all params from the given face.
   </string>
 
   <!-- Avatar busy/away mode -->
-	<string name="AvatarSetNotAway">Set Not Away</string>
-	<string name="AvatarSetAway">Set Away</string>
-	<string name="AvatarSetNotBusy">Set Not Busy</string>
-	<string name="AvatarSetBusy">Set Busy</string>
+	<string name="AvatarSetNotAway">Not Away</string>
+	<string name="AvatarSetAway">Away</string>
+	<string name="AvatarSetNotBusy">Not Busy</string>
+	<string name="AvatarSetBusy">Busy</string>
 	
 	<!-- Wearable Types -->
 	<string name="shape">Shape</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 5bb48ef5aa..6b11e72247 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Additional attributes:
+  image_pressed
+	image_pressed_selected
+   -->
 <button image_unselected="PushButton_Off"
         image_selected="PushButton_Selected"
         image_disabled_selected="PushButton_Selected_Disabled"
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
index fa3cb9275e..132bd24bca 100644
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
@@ -16,7 +16,9 @@
                               scale_image="true"
                               pad_right="24"
                               image_unselected="DropDown_Off"
-                              image_selected="DropDown_Selected"
+                              image_selected="DropDown_On"
+                              image_pressed="DropDown_Press" 
+                              image_pressed_selected="DropDown_Press"
                               image_disabled="DropDown_Disabled" />
   <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor"
                         background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml
index 61950d7554..8ec206023e 100644
--- a/indra/newview/skins/default/xui/en/widgets/inspector.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- See also settings.xml UIFloater* settings for configuration -->
 <inspector name="inspector"
-          bg_opaque_color="ToolTipBgColor"
+          bg_opaque_color="DkGray_66"
           background_visible="true"
           bg_opaque_image="none"
+          background_opaque="true"
           bg_alpha_image="none"
+		  text_color="InspectorTipTextColor"
  />
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
index 0794b49a0c..f936a1e208 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<scroll_column_header image_unselected="square_btn_32x128.tga"
-                      image_selected="square_btn_selected_32x128.tga"
-                      image_disabled="square_btn_32x128.tga"
-                      image_disabled_selected="square_btn_selected_32x128.tga"
-                      image_overlay="combobox_arrow.tga"
+<scroll_column_header
+		    image_unselected="SegmentedBtn_Middle_Selected"
+                      image_selected="SegmentedBtn_Middle_Selected"
+		      image_pressed="SegmentedBtn_Middle_Selected_Press"
+                      image_disabled="SegmentedBtn_Middle_Disabled"
+                      image_disabled_selected="SegmentedBtn_Middle_Selected_Disabled"
+                      image_overlay="DisclosureArrow_Opened_Off"
                       image_overlay_alignment="right"
                       halign="left"
-                      scale_image="true"/>
+                      scale_image="true" />
diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
index 6b49f832fd..a19201f7c3 100644
--- a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
@@ -5,6 +5,8 @@
           padding="4"
           wrap="true"
           font="SansSerif"
-          bg_opaque_color="ToolTipBgColor"
+          bg_opaque_image="Tooltip"
+          background_opaque="true"
           background_visible="true"
+		  text_color="ToolTipTextColor"
  />