Added viewer-release.release-viewer.jira parameter to write build comment to DRTVWR-13

98 files changed, 1423 insertions, 5711 deletions

diff --git a/indra/newview/skins/default/xui/en/alert_check_box.xml b/indra/newview/skins/default/xui/en/alert_check_box.xml
index 9f1bdb5193..5535a5dc2a 100644
--- a/indra/newview/skins/default/xui/en/alert_check_box.xml
+++ b/indra/newview/skins/default/xui/en/alert_check_box.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <check_box
-  text_enabled_color="LabelTextColor"
-  text_disabled_color="LabelDisabledColor"
+  label_text.text_color="LabelTextColor"
+  label_text.text_readonly_color="LabelDisabledColor"
   font="SansSerif"
   follows="left|top"
   name="check"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index b365040c20..e7dd62eb64 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -22,6 +22,6 @@
  pad_right="9"
  scale_image="true"
  tab_stop="false"
- top="0"
+ bottom="0"
  use_ellipses="true"
  width="140" />
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index d78fb281a9..930bbaa8cb 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -19,8 +19,8 @@
  width="320">
   <string name="nudge_parabuild" translate="false">Nudge 1</string>
   <string name="test_the_vlt">This string CHANGE2 is extracted.</string>
-  <string name="testing_eli">Testing access to beta branch</string>
-  <chat_history
+  <string name="testing_eli">Just a test. changes.</string>
+  <text_editor
    parse_urls="true"
    bg_readonly_color="ChatHistoryBgColor"
    bg_writeable_color="ChatHistoryBgColor" 
@@ -32,26 +32,51 @@
    layout="topleft"
 	 height="260"
    name="chat_history"
+   max_length="200000" 
    parse_highlights="true"
    text_color="ChatHistoryTextColor"
    text_readonly_color="ChatHistoryTextColor"
    translate="false"
+   track_end="true" 
+   wrap="true" 
    width="320">
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-Really long line that is long enough to wrap once with jyg descenders.
-  </chat_history>
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    Really long line that is long enough to wrap once with jyg descenders.
+    </text_editor>
 </floater>
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 e6f11cac60..89ed16e7c2 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -220,7 +220,8 @@
              layout="topleft"
              left_pad="2"
              name="OwnerText"
-             width="240">
+             use_ellipses="true" 
+             width="360">
                 Leyla Linden
             </text>
              <button
@@ -374,7 +375,8 @@ Leyla Linden               </text>
              left_delta="-199"
              name="For sale to"
              top_delta="20"
-             width="186">
+             use_ellipses="true" 
+             width="340">
                 For sale to: [BUYER]
             </text>
             <text
@@ -410,7 +412,7 @@ Leyla Linden               </text>
              right="-10"
              name="Cancel Land Sale"
              left_pad="5"
-             top_pad="-25"
+             top_pad="-15"
              width="180" />
             <text
              type="string"
@@ -541,7 +543,7 @@ Leyla Linden               </text>
              layout="topleft"
              left_delta="0"
              name="Reclaim Land..."
-             top_delta="-61"
+             top_delta="-50"
              width="180" />
             <button
              enabled="false"
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index f59badfcb4..a11946d352 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -5,11 +5,11 @@
  height="350"
  layout="topleft"
  min_height="200"
- min_width="265"
+ min_width="400"
  name="avatarpicker"
  help_topic="avatarpicker"
  title="CHOOSE RESIDENT"
- width="265">
+ width="500">
     <floater.string
      name="not_found">
         &apos;[TEXT]&apos; not found
@@ -40,7 +40,7 @@
      name="ResidentChooserTabs"
      tab_position="top"
      top="20"
-     width="265">
+     width="500">
         <panel
          border="none"
          height="150"
@@ -83,14 +83,24 @@
              left_pad="5"
              name="Find"
              width="45" />
-            <scroll_list
-             follows="all"
-             height="98"
-             layout="topleft"
-             left="0"
-             name="SearchResults"
-             top="52"
-             width="132" />
+          <scroll_list
+            draw_heading="true" 
+           follows="all"
+           height="98"
+           layout="topleft"
+           left="0"
+           name="SearchResults"
+           top="52"
+           width="132">
+            <columns
+              label="Name"
+              name="name"
+              width="150" />
+            <columns
+              label="Username"
+              name="username"
+              width="150" />
+          </scroll_list>
         </panel>
         <panel
          border="none"
@@ -128,7 +138,7 @@
             </button>
             <scroll_list
              follows="all"
-             height="100"
+             height="120"
              border="false"
              layout="topleft"
              left="0"
@@ -194,7 +204,8 @@
              width="28"
              name="Refresh"
              image_overlay="Refresh_Off" />
-            <scroll_list
+          <scroll_list
+             draw_heading="true"
              follows="all"
              height="100"
              border="false"
@@ -202,21 +213,30 @@
              left="0"
              name="NearMe"
              sort_column="0"
-             top="50"
-             width="132" />
+             top="52"
+             width="132">
+            <columns
+              label="Name"
+              name="name"
+              width="150" />
+            <columns
+              label="Username"
+              name="username"
+              width="150" />
+          </scroll_list>
         </panel>
     </tab_container>
     <button
-     follows="right|bottom"
+     follows="left|bottom"
      height="23"
      label="OK"
      label_selected="OK"
      name="ok_btn"
      top_pad="3"
-     left="46"
+     left="10"
      width="100" />
     <button
-     follows="right|bottom"
+     follows="left|bottom"
      height="23"
      label="Cancel"
      label_selected="Cancel"
diff --git a/indra/newview/skins/default/xui/en/floater_bumps.xml b/indra/newview/skins/default/xui/en/floater_bumps.xml
index 303c28d7c8..1f2fe62b3c 100644
--- a/indra/newview/skins/default/xui/en/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/en/floater_bumps.xml
@@ -14,23 +14,23 @@
     </floater.string>
     <floater.string
      name="bump">
-        [TIME]  [FIRST] [LAST] bumped you
+        [TIME]  [NAME] bumped you
     </floater.string>
     <floater.string
      name="llpushobject">
-        [TIME]  [FIRST] [LAST] pushed you with a script
+        [TIME]  [NAME] pushed you with a script
     </floater.string>
     <floater.string
      name="selected_object_collide">
-        [TIME]  [FIRST] [LAST] hit you with an object
+        [TIME]  [NAME] hit you with an object
     </floater.string>
     <floater.string
      name="scripted_object_collide">
-        [TIME]  [FIRST] [LAST] hit you with a scripted object
+        [TIME]  [NAME] hit you with a scripted object
     </floater.string>
     <floater.string
      name="physical_object_collide">
-        [TIME]  [FIRST] [LAST] hit you with a physical object
+        [TIME]  [NAME] hit you with a physical object
     </floater.string>
     <floater.string
      name="timeStr">
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
index 77a0e9b91b..babbf0f5ca 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
@@ -56,7 +56,7 @@
     <text
      type="string"
      length="1"
-     follows="left|bottom"
+     follows="left|right|bottom"
      font="SansSerif"
      height="16"
      layout="topleft"
@@ -64,6 +64,7 @@
      name="buy_text"
      text_color="white"
      top="220"
+     use_ellipses="true" 
      width="260">
         Buy for L$[AMOUNT] from [NAME]?
     </text>
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index 4b990fa566..b9c415633f 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -16,6 +16,7 @@
     https://quick-buy.secondlife.com/[LANGUAGE]/display/?sa=[SPECIFIC_AMOUNT]&amp;sum=[SUM]&amp;msg=[MSG]&amp;bal=[BAL]
   </floater.string>
   <web_browser
+    trusted_content="true" 
     follows="all"
     layout="topleft"
     left="1"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index c88de878f4..d5d4565ca1 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -569,7 +569,7 @@ sold with objects
          name="US$6.00/month,billedannually" />
     </combo_box>
     <locate
-     height="10"
+     height="5"
      layout="topleft" />
     <icon
      follows="top|left"
@@ -590,7 +590,7 @@ sold with objects
      left="72"
      name="land_use_action"
      right="438"
-     top="284"
+     top="279"
      width="218"
      wrap="true">
         Increase your monthly land use fees to US$ 40/month.
@@ -610,7 +610,7 @@ sold with objects
 This parcel is 512 m² of land.
     </text>
     <locate
-     height="10"
+     height="5"
      layout="topleft" />
     <icon
      follows="top|left"
@@ -654,7 +654,7 @@ This parcel is 512 m² of land.
      left_delta="0"
      name="currency_action"
      top_pad="9"
-     width="90">
+     width="95">
         Buy additional L$
     </text>
     <locate
diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index 3d8f5d678b..8dfb6ba00c 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="290"
+ height="310"
  layout="topleft"
  min_height="150"
  min_width="225"
@@ -84,16 +84,34 @@
      length="1"
      follows="left|right|bottom"
      font="SansSerif"
-     height="16"
+     height="15"
      layout="topleft"
      left_delta="0"
+	 line_spacing.pixels="7"
      name="buy_text"
      text_color="white"
      top_pad="5"
      use_ellipses="true"
-     width="260">
-        Buy for L$[AMOUNT] from [NAME]?
+     width="260"
+	 word_wrap="true">
+Buy for L$[AMOUNT] from:
     </text>
+  <text
+     type="string"
+     length="1"
+     follows="left|right|bottom"
+     font="SansSerif"
+     height="15"
+     layout="topleft"
+     left_delta="0"
+	 line_spacing.pixels="7"
+     name="buy_name_text"
+     text_color="white"
+     top_pad="5"
+     use_ellipses="true"
+     width="260">
+    [NAME]?
+  </text>
     <button
      follows="right|bottom"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
deleted file mode 100644
index 01bced81d0..0000000000
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ /dev/null
@@ -1,3389 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="false"
- follows="left|top"
- height="583"
- layout="topleft"
- left_delta="-3"
- name="floater customize"
- help_topic="floater_customize"
- save_rect="true"
- title="APPEARANCE"
- top_delta="-185"
- width="600">
-    <tab_container
-     height="517"
-     layout="topleft"
-     left="10"
-     name="customize tab container"
-     tab_min_width="96"
-     tab_position="left"
-     tab_height="50"
-     top="26"
-     width="580">
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="5"
-             name="body_parts_placeholder"
-	     font="SansSerifSmallBold"
-             top="10"
-             width="100">
-                Body Parts
-            </text>
-	    <placeholder />
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Shape"
-         layout="topleft"
-         name="Shape"
-         help_topic="customize_shape_tab"
-         width="400">
-            <icon
-             follows="top|right"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="315"
-             mouse_opaque="true"
-             name="square"
-             top="4"
-             width="18" />
-            <icon
-             height="16"
-	     top="10"
-	     left="10"
-             layout="topleft"
-             mouse_opaque="true"
-             width="16" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Shape"
-             label_selected="Create New Shape"
-             layout="topleft"
-             left="10"
-             name="Create New"
-             top="104"
-             width="160" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Body"
-             label_selected="Body"
-             layout="topleft"
-             left="10"
-             name="Body"
-             top="63"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Head"
-             label_selected="Head"
-             layout="topleft"
-             left_delta="0"
-             name="Head"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Eyes"
-             label_selected="Eyes"
-             layout="topleft"
-             left_delta="0"
-             name="Eyes"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Ears"
-             label_selected="Ears"
-             layout="topleft"
-             left_delta="0"
-             name="Ears"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Nose"
-             label_selected="Nose"
-             layout="topleft"
-             left_delta="0"
-             name="Nose"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Mouth"
-             label_selected="Mouth"
-             layout="topleft"
-             left_delta="0"
-             name="Mouth"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Chin"
-             label_selected="Chin"
-             layout="topleft"
-             left_delta="0"
-             name="Chin"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Torso"
-             label_selected="Torso"
-             layout="topleft"
-             left_delta="0"
-             name="Torso"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Legs"
-             label_selected="Legs"
-             layout="topleft"
-             left_delta="0"
-             name="Legs"
-             top_pad="4"
-             width="82" />
-            <radio_group
-             control_name="AvatarSex"
-             height="34"
-             layout="topleft"
-             name="sex radio"
-	     top_pad="10"
-             width="82">
-                <radio_item
-                 height="16"
-                 label="Female"
-                 layout="topleft"
-                 name="radio"
-                 value="0"
-                 width="82" />
-                <radio_item
-                 height="16"
-                 label="Male"
-                 layout="topleft"
-                 name="radio2"
-                 value="1"
-                 width="82" />
-            </radio_group>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new shape by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <text
-             type="string"
-             length="1"
-             top="488"
-             follows="left|top"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="topleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Shape:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             name="Save"
-             left_pad="2"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             name="Save As"
-             top="477"
-             left_pad="3"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Skin"
-         layout="topleft"
-         name="Skin"
-         help_topic="customize_skin_tab"
-         width="400">
-            <icon
-             follows="top|right"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="315"
-             mouse_opaque="true"
-             name="square"
-             top="4"
-             width="18" />
-            <icon
-             height="16"
-	     top="10"
-	     left="10"
-             layout="topleft"
-             mouse_opaque="true"
-             width="16" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Skin"
-             label_selected="Create New Skin"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-249"
-             width="160" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Skin Color"
-             label_selected="Skin Color"
-             layout="topleft"
-             left="10"
-             name="Skin Color"
-             top="63"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Face Detail"
-             label_selected="Face Detail"
-             layout="topleft"
-             left_delta="0"
-             name="Face Detail"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Makeup"
-             label_selected="Makeup"
-             layout="topleft"
-             left_delta="0"
-             name="Makeup"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Body Detail"
-             label_selected="Body Detail"
-             layout="topleft"
-             left_delta="0"
-             name="Body Detail"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new skin by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             allow_no_texture="true"
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Head Tattoos"
-             layout="topleft"
-             left="10"
-             name="Head Tattoos"
-             tool_tip="Click to choose a picture"
-             top="176"
-             width="82" />
-            <texture_picker
-             allow_no_texture="true"
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Upper Tattoos"
-             layout="topleft"
-             left_delta="0"
-             name="Upper Tattoos"
-             tool_tip="Click to choose a picture"
-             top_delta="102"
-             width="82" />
-            <texture_picker
-             allow_no_texture="true"
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Lower Tattoos"
-             layout="topleft"
-             left_delta="0"
-             name="Lower Tattoos"
-             tool_tip="Click to choose a picture"
-             top_delta="102"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             top="488"
-             follows="left|top"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="topleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Skin:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Hair"
-         layout="topleft"
-         name="Hair"
-         help_topic="customize_hair_tab"
-         width="400">
-            <icon
-             follows="top|right"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="315"
-             mouse_opaque="true"
-             name="square"
-             top="4"
-             width="18" />
-            <icon
-             height="16"
-	     top="10"
-	     left="10"
-             layout="topleft"
-             mouse_opaque="true"
-             width="16" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Color"
-             label_selected="Color"
-             layout="topleft"
-             left="10"
-             name="Color"
-             top="63"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Style"
-             label_selected="Style"
-             layout="topleft"
-             left_delta="0"
-             name="Style"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Eyebrows"
-             label_selected="Eyebrows"
-             layout="topleft"
-             name="Eyebrows"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Facial"
-             label_selected="Facial"
-             layout="topleft"
-             name="Facial"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new hair by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Texture"
-             layout="topleft"
-             left="10"
-             name="Texture"
-             tool_tip="Click to choose a picture"
-             top="176"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Hair"
-             label_selected="Create New Hair"
-             layout="topleft"
-             left_delta="0"
-             name="Create New"
-             top_delta="-89"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             top="488"
-             follows="left|top"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="topleft"
-             name="Item Action Label"
-             left="10"
-             width="130">
-                Hair:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Eyes"
-         layout="topleft"
-         name="Eyes"
-         help_topic="customize_eyes_tab"
-         width="400">
-            <icon
-             follows="top|right"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="315"
-             mouse_opaque="true"
-             name="square"
-             top="4"
-             width="18" />
-            <icon
-             height="16"
-	     top="10"
-	     left="10"
-             layout="topleft"
-             mouse_opaque="true"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new set of eyes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Iris"
-             layout="topleft"
-             left="10"
-             name="Iris"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Eyes"
-             label_selected="Create New Eyes"
-             layout="topleft"
-             name="Create New"
-             top="66"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             left="10"
-             width="130">
-                Eyes:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="5"
-             name="clothes_placeholder"
-	     font="SansSerifSmallBold"
-             top="125"
-             width="100">
-                Clothes
-            </text>
-	    <placeholder />
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Shirt"
-         layout="topleft"
-         name="Shirt"
-         help_topic="customize_shirt_tab"
-         top_delta="0"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-	     top="10"
-	     left="10"
-             layout="topleft"
-             mouse_opaque="true"
-             width="16" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Shirt"
-             label_selected="Create New Shirt"
-             layout="topleft"
-             name="Create New"
-             top="66"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             left="10"
-             width="130">
-                Shirt:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new shirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Pants"
-         layout="topleft"
-         name="Pants"
-         help_topic="customize_pants_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Pants"
-             label_selected="Create New Pants"
-             layout="topleft"
-             name="Create New"
-             top="66"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             name="Item Action Label"
-             left="10"
-             width="130">
-                Pants:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on new pants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Shoes"
-         layout="topleft"
-         name="Shoes"
-         help_topic="customize_shoes_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new pair of shoes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Shoes"
-             label_selected="Create New Shoes"
-             layout="topleft"
-             name="Create New"
-             top_pad="18"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Shoes:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Socks"
-         layout="topleft"
-         name="Socks"
-         help_topic="customize_socks_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on new socks by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Socks"
-             label_selected="Create New Socks"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Socks:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Jacket"
-         layout="topleft"
-         name="Jacket"
-         help_topic="customize_jacket_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new jacket by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Jacket"
-             label_selected="Create New Jacket"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Upper Fabric"
-             layout="topleft"
-             left="10"
-             name="Upper Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Lower Fabric"
-             layout="topleft"
-             name="Lower Fabric"
-             tool_tip="Click to choose a picture"
-             top_delta="102"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Jacket:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Gloves"
-         layout="topleft"
-         name="Gloves"
-         help_topic="customize_gloves_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on new gloves by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Gloves"
-             label_selected="Create New Gloves"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Gloves:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Undershirt"
-         layout="topleft"
-         name="Undershirt"
-         help_topic="customize_undershirt_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new undershirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Undershirt"
-             label_selected="Create New Undershirt"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Undershirt:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Underpants"
-         layout="topleft"
-         name="Underpants"
-         help_topic="customize_underpants_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on new underpants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Underpants"
-             label_selected="Create New Underpants"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Underpants:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Skirt"
-         layout="topleft"
-         name="Skirt"
-         help_topic="customize_skirt_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new skirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Skirt"
-             label_selected="Create New Skirt"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Fabric"
-             layout="topleft"
-             left="10"
-             name="Fabric"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="108"
-             label="Color/Tint"
-             layout="topleft"
-             name="Color/Tint"
-             tool_tip="Click to open color picker"
-             top_delta="102"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Skirt:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Tattoo"
-         layout="topleft"
-         name="Tattoo"
-         help_topic="customize_tattoo_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new tattoo by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Tattoo"
-             label_selected="Create New Tattoo"
-             layout="topleft"
-             name="Create New"
-             top_pad="7"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Head Tattoo"
-             layout="topleft"
-             left="10"
-             name="Head Tattoo"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Upper Tattoo"
-             layout="topleft"
-             name="Upper Tattoo"
-             tool_tip="Click to choose a picture"
-             left_delta="90"
-             width="82" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Lower Tattoo"
-             layout="topleft"
-             name="Lower Tattoo"
-             tool_tip="Click to choose a picture"
-             left_delta="90"
-             width="82" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             top_pad="4"
-             left="10"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Tattoo:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-        <panel
-         border="false"
- background_visible="true"
- bg_alpha_color="DkGray2"
-         follows="left|top|right|bottom"
-         height="508"
-         label="Alpha"
-         layout="topleft"
-         name="Alpha"
-         help_topic="customize_alpha_tab"
-         width="400">
-            <icon
-             follows="top|left"
-             height="18"
-             image_name="Lock"
-             layout="topleft"
-             left="10"
-             mouse_opaque="true"
-             name="square"
-             top="10"
-             width="18" />
-            <icon
-             height="16"
-             layout="topleft"
-	     left="10"
-             mouse_opaque="true"
-	     top="10"
-             width="16" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title"
-             top="10"
-             width="355">
-                [DESC]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_no_modify"
-             top="10"
-             width="355">
-                [DESC]: cannot modify
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_loading"
-             top="10"
-             width="355">
-                [DESC]: loading...
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="31"
-             name="title_not_worn"
-             top="10"
-             width="355">
-                [DESC]: not worn
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="14"
-             layout="topleft"
-             left="10"
-             name="path"
-             top="36"
-             width="373">
-                Located in [PATH]
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="not worn instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                Put on a new alpha mask by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
-            </text>
-            <button
-             follows="left|top"
-             height="23"
-             label="Create New Alpha"
-             label_selected="Create New Alpha"
-             layout="topleft"
-             name="Create New"
-             top_pad="18"
-             width="160" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             height="28"
-             layout="topleft"
-             left="10"
-             name="no modify instructions"
-             top="31"
-             word_wrap="true"
-             width="373">
-                You do not have permission to modify this wearable.
-            </text>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Lower Alpha"
-             layout="topleft"
-             left="10"
-             name="Lower Alpha"
-             tool_tip="Click to choose a picture"
-             top="66"
-             width="82" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Upper Alpha"
-             layout="topleft"
-             name="Upper Alpha"
-             tool_tip="Click to choose a picture"
-             left_delta="90"
-             width="82" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Head Alpha"
-             layout="topleft"
-             name="Head Alpha"
-             tool_tip="Click to choose a picture"
-             left_delta="90"
-             width="82" />
-            <check_box
-             control_name="LowerAlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left="43"
-             name="lower alpha texture invisible"
-             top_delta="96"
-             width="16" />
-            <check_box
-             control_name="UpperAlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left_pad="72"
-             name="upper alpha texture invisible"
-             width="16" />
-            <check_box
-             control_name="HeadAlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left_pad="72"
-             name="head alpha texture invisible"
-             width="16" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Eye Alpha"
-             layout="topleft"
-             name="Eye Alpha"
-             tool_tip="Click to choose a picture"
-             left="10"
-             top_pad="20"
-             width="82" />
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             follows="left|top"
-             height="108"
-             label="Hair Alpha"
-             layout="topleft"
-             name="Hair Alpha"
-             left_delta="90"
-             tool_tip="Click to choose a picture"
-             width="82" />
-            <check_box
-             control_name="Eye AlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left="43"
-             name="eye alpha texture invisible"
-             top_delta="96"
-             width="16" />
-            <check_box
-             control_name="HairAlphaTextureInvisible"
-             follows="left"
-             height="16"
-             layout="topleft"
-             left_pad="72"
-             name="hair alpha texture invisible"
-             width="16" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Take Off"
-             label_selected="Take Off"
-             layout="topleft"
-             name="Take Off"
-             left="10"
-             top_pad="20"
-             width="82" />
-            <text
-             type="string"
-             length="1"
-             bottom="4"
-             follows="left|bottom"
-             font="SansSerif"
-             halign="right"
-             height="23"
-             layout="bottomleft"
-             left="10"
-             name="Item Action Label"
-             width="130">
-                Alpha:
-            </text>
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save"
-             label_selected="Save"
-             layout="topleft"
-             left_pad="2"
-             name="Save"
-             top="477"
-             width="82" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Save As..."
-             label_selected="Save As..."
-             layout="topleft"
-             left_pad="3"
-             name="Save As"
-             top="477"
-             width="115" />
-            <button
-             follows="left|bottom"
-             height="23"
-             label="Revert"
-             label_selected="Revert"
-             layout="topleft"
-             left_pad="3"
-             name="Revert"
-             top="477"
-             width="120" />
-        </panel>
-    </tab_container>
-    <scroll_container
-     follows="left|top|right|bottom"
-     height="409"
-     layout="topleft"
-     left="247"
-     mouse_opaque="false"
-     name="panel_container"
-     top="92"
-     width="330">
-        <scrolling_panel_list
-         follows="left|bottom"
-         layout="topleft"
-         name="panel_list" />
-    </scroll_container>
-    <button
-     bottom="460"
-     follows="right|left"
-     height="23"
-     label="Script Info"
-     label_selected="Script Info"
-     layout="topleft"
-     name="script_info"
-     tool_tip="Show scripts attached to your avatar"
-     left="13"
-     width="90" ></button>
-    <button
-     bottom="574"
-     follows="right|bottom"
-     height="23"
-     label="Make Outfit"
-     label_selected="Make Outfit"
-     layout="topleft"
-     name="make_outfit_btn"
-     right="-218"
-     width="120" />
-    <button
-     bottom="574"
-     follows="right|bottom"
-     height="23"
-     label="Cancel"
-     label_selected="Cancel"
-     layout="topleft"
-     name="Cancel"
-     right="-10"
-     width="100" />
-    <button
-     bottom="574"
-     follows="right|bottom"
-     height="23"
-     label="OK"
-     label_selected="OK"
-     layout="topleft"
-     name="Ok"
-     right="-114"
-     width="100" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_device_settings.xml b/indra/newview/skins/default/xui/en/floater_device_settings.xml
deleted file mode 100644
index 91a7a678da..0000000000
--- a/indra/newview/skins/default/xui/en/floater_device_settings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="260"
- layout="topleft"
- name="floater_device_settings"
- help_topic="floater_device_settings"
- title="VOICE CHAT DEVICE SETTINGS"
- width="405">
-    <panel
-     bottom="260"
-     filename="panel_audio_device.xml"
-     layout="topleft"
-     left="2"
-     name="device_settings"
-     right="-5"
-     top="20" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
new file mode 100644
index 0000000000..9a9fd32a77
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ can_close="false" 
+ height="300"
+ layout="topleft"
+ name="Display Name"
+ help_topic="display_name"
+ save_rect="false"
+ title="CHANGE DISPLAY NAME" 
+ width="445">
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="40"
+     layout="topleft"
+     left="25"
+     name="info_text"
+     top="40"
+     use_ellipses="true"
+     width="380"
+     wrap="true">
+      The name you give your avatar is called your Display Name. You can change it once a week.
+    </text>
+	<text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="25"
+     layout="topleft"
+     left="25"
+	 text_color="EmphasisColor" 
+     name="lockout_text"
+     top="80"
+     use_ellipses="true"
+	 visible="false" 
+     width="410"
+     wrap="true">
+		You cannot change your Display Name until: [TIME].
+	</text>
+    <text
+      top_pad="10"
+      width="150"
+      height="20"
+      font="SansSerif"
+      name="set_name_label">
+      New Display Name:
+    </text>
+    <line_editor
+      width="330"
+      name="display_name_editor"
+      max_length_chars="31"
+      height="20"
+      top_pad="5"
+      left="50" />
+	<text
+       top_pad="15"
+       left="25"
+       width="300"
+       height="20"
+      font="SansSerif"
+    name="name_confirm_label">
+      Type your new name again to confirm:
+    </text>
+    <line_editor
+      width="330"
+      name="display_name_confirm"
+      max_length_chars="31"
+      height="20"
+      top_pad="5"
+      left="50" />
+    <button
+     height="23"
+     label="Save"
+     layout="topleft"
+     font="SansSerif"
+     left="35"
+     name="save_btn"
+     tool_tip="Save your new Display Name" 
+     top_pad="40"
+     width="120" />
+    <button
+     height="23"
+     label="Reset"
+     layout="topleft"
+     font="SansSerif"
+     left_pad="5"
+     name="reset_btn"
+     tool_tip="Make Display Name the same as Username"
+     width="120" />
+    <button
+     height="23"
+     label="Cancel"
+     font="SansSerif"
+     layout="topleft"
+     left_pad="5"
+     name="cancel_btn"
+     width="120" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index 9864083442..7ed020f832 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -1,311 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  follows="all"
- height="350"
+ height="400"
+ can_resize="true"
  help_topic="event_details"
  label="Event"
  layout="topleft"
  name="Event"
+ save_rect="true"
+ save_visibility="false"
  title="EVENT DETAILS" 
- width="330">
-  <floater.string
-   name="none">
-    none
-  </floater.string>
-  <floater.string
-   name="notify">
-    Notify
-  </floater.string>
-  <floater.string
-   name="dont_notify">
-    Don&apos;t Notify
-  </floater.string>
-  <floater.string
-   name="moderate">
-    Moderate
-  </floater.string>
-  <floater.string
-   name="adult">
-    Adult
-  </floater.string>
-  <floater.string
-   name="general">
-    General
-  </floater.string>
-  <floater.string
-   name="unknown">
-    Unknown
-  </floater.string>
-  <layout_stack
-    name="layout"
-    orientation="vertical"
-    follows="all"
-    layout="topleft"
-    left="0"
-    top="0"
-    height="350"
-    width="330"
-    border_size="0">
-    <layout_panel
-       name="profile_stack"
-       follows="top|left"
-       layout="topleft"
-       top="0"
-       left="0"
-       height="305"
-       width="330">
-      <text
-       follows="top|left|right"
-       font="SansSerifLarge"
-       text_color="white"
-       height="17"
-       layout="topleft"
-       left="10"
-       name="event_name"
-       top="5"
-       use_ellipses="true"
-       width="310">
-        Nameless Event...of Doom! De doom! Doom doom.
-      </text>
-      <text
-        type="string"
-        length="1"
-        follows="top|left"
-        height="13"
-        text_color="LtGray_50"
-        layout="topleft"
-        left="25"
-        name="event_category"
-        width="300">
-        (no category)
-      </text>
-
-      <text
-       type="string"
-       length="1"
-       follows="top|left"
-       layout="topleft"
-       left="10"
-       top_pad="7"
-       name="event_runby_label"
-       width="90">
-        Run by:
-      </text>
-      <text
-        follows="left|top"
-        height="20"
-        initial_value="(retrieving)"
-        layout="topleft"
-        left_pad="0"
-        link="true"
-        name="event_runby"
-        top_delta="0"
-        use_ellipses="true"
-        width="240" />
-      <text
-       type="string"
-       length="1"
-       follows="top|left"
-       layout="topleft"
-       left="10"
-       top_pad="5"
-       name="event_date_label"
-       width="90">
-        Date:
-      </text>
-      <text
-     type="string"
-     length="1"
-     left_pad="0"
-     height="17"
-     top_delta="0"
-     follows="top|left"
+ width="600">
+	<floater.string
+		name="loading_text">
+		Loading...
+	</floater.string>
+    <floater.string
+     name="done_text">
+        Done
+    </floater.string>
+  <web_browser
+     trusted_content="true" 
+     follows="left|right|top|bottom"
      layout="topleft"
-     name="event_date"
-     width="240">
-        10/10/2010
-      </text>
-      <text
-       type="string"
-       length="1"
-       follows="top|left"
-       layout="topleft"
-       left="10"
-       top_pad="5"
-       name="event_duration_label"
-       width="90">
-        Duration:
-      </text>
-      <text
-       type="string"
-       height="14"
-       length="1"
-       left_pad="0"
-       follows="top|left"
-       layout="topleft"
-       name="event_duration"
-       top_delta="0"
-       width="240">
-        1 hour
-      </text>
-      <text
-       type="string"
-       length="1"
-       follows="top|left"
-       layout="topleft"
-       left="10"
-       top_pad="5"
-       name="event_covercharge_label"
-       width="90">
-        Cover charge:
-      </text>
-      <text
-        type="string"
-        follows="left|top"
-        height="16"
-        layout="topleft"
-       left_pad="0"
-       name="event_cover"
-        visible="true"
-        width="240"
-        top_delta="0">
-        Free
-      </text>
-      <text
-       type="string"
-       length="1"
-       follows="top|left"
-       layout="topleft"
-       left="10"
-       top_pad="5"
-       name="event_location_label"
-       width="90">
-        Location:
-      </text>
-      <text
-       type="string"
-       length="1"
-       height="20"
-       left_pad="0"
-       follows="top|left"
-       layout="topleft"
-       name="event_location"
-       use_ellipses="true"
-       top_delta="0"
-       value="SampleParcel, Name Long (145, 228, 26)"
-       width="240" />
-      <icon
-       follows="top|left"
-       height="16"
-       image_name="Parcel_PG_Dark"
-       layout="topleft"
-       left="10"
-       name="rating_icon_pg"
-       width="18" />
-      <icon
-       follows="top|left"
-       height="16"
-       image_name="Parcel_M_Dark"
-       layout="topleft"
-       left="10"
-       name="rating_icon_m"
-       top_delta="0"
-       width="18" />
-      <icon
-       follows="top|left"
-       height="16"
-       image_name="Parcel_R_Dark"
-       layout="topleft"
-       left="10"
-       name="rating_icon_r"
-       top_delta="0"
-       width="18" />
-      <text
-       follows="left|top"
-       height="16"
-       layout="topleft"
-       left_pad="12"
-       name="rating_label"
-       top_delta="3"
-       value="Rating:"
-       width="90" />
-      <text
-       follows="left|right|top"
-       height="16"
-       layout="topleft"
-       left_pad="2"
-       name="rating_value"
-       top_delta="0"
-       value="unknown"
-       width="240" />
-      <expandable_text
-       follows="left|top|right"
-       height="65"
-       layout="topleft"
-       left="6"
-       name="event_desc"
-       width="322">
-       Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</expandable_text>
-    </layout_panel>
-    <layout_panel
-       follows="left|right"
-       height="24"
-       layout="topleft"
-       mouse_opaque="false"
-       name="button_panel"
-       top="0"
-       left="0"
-       user_resize="false">
-      <button
-       follows="left|top"
-           height="18"
-           image_selected="AddItem_Press"
-           image_unselected="AddItem_Off"
-           image_disabled="AddItem_Disabled"
-           layout="topleft"
-           left="6"
-       name="create_event_btn"
-           tool_tip="Create Event"
-           width="18" />
-      <button
-       follows="left|top"
-           height="18"
-           image_selected="MinusItem_Press"
-           image_unselected="MinusItem_Off"
-           image_disabled="MinusItem_Disabled"
-           layout="topleft"
-           visible="false" 
-           left="6"
-           top_pad="-7" 
-          name="god_delete_event_btn"
-           tool_tip="Delete Event"
-           width="18" />
-      <button
-   follows="left|top"
-   height="23"
-   label="Notify Me"
-   layout="topleft"
-   left_pad="3"
-   top_delta="-12"
-   name="notify_btn"
-   width="100" />
-      <button
-       follows="left|top"
-       height="23"
-       label="Teleport"
-       layout="topleft"
-       left_pad="5"
-       name="teleport_btn"
-       width="100" />
-      <button
-       follows="left|top"
-       height="23"
-       label="Map"
-       layout="topleft"
-       left_pad="5"
-       name="map_btn"
-       width="85" />
-    </layout_panel>
-  </layout_stack>
-  </floater>
+     left="10"
+     name="browser"
+     height="365"
+     width="580"
+     top="0"/>
+	<text
+	 follows="bottom|left"
+	 height="16"
+	 layout="topleft"
+	 left_delta="0"
+	 name="status_text"
+	 top_pad="10"
+	 width="150" />	 
+</floater>
 
diff --git a/indra/newview/skins/default/xui/en/floater_first_time_tip.xml b/indra/newview/skins/default/xui/en/floater_first_time_tip.xml
deleted file mode 100644
index e4ac8fed77..0000000000
--- a/indra/newview/skins/default/xui/en/floater_first_time_tip.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_close="true"
- can_minimize="false"
- height="250"
- layout="topleft"
- name="set_name_in_the_cladd"
- help_topic="set_name_in_the_cladd"
- save_rect="true"
- width="300">
-    <check_box
-     height="20"
-     follows="left|bottom|right"
-     label="Turn off Quick Tips"
-     layout="topleft"
-     left="5"
-     name="DontShowFirstTimeTip_checkbox"
-     text_enabled_color="white"
-     top="225"
-     width="200" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index 27f8b4bb39..0ea42f9757 100644
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -71,6 +71,18 @@
          name="16x"
          value="16" />
     </combo_box>
+   <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left_pad="10"
+     name="antialiasing restart"
+     top_delta="0"
+     width="188">
+      (requires viewer restart)
+    </text>
     <spinner
      control_name="RenderGamma"
      decimal_digits="2"
diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index 470997d28b..837923bcf6 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -24,6 +24,7 @@
      follows="left|right|top|bottom"
      layout="topleft"
      left="5"
+     orientation="vertical" 
      name="stack1"
      top="20"
      width="640">
@@ -35,6 +36,7 @@
          user_resize="false"
          width="620">
             <web_browser
+              trusted_content="true" 
              bottom="-25"
              follows="left|right|top|bottom"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml
deleted file mode 100644
index 55efe83820..0000000000
--- a/indra/newview/skins/default/xui/en/floater_im.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater
- legacy_header_height="18" 
- can_resize="true"
- follows="left|bottom"
- height="422"
- layout="topleft"
- min_height="130"
- min_width="350"
- name="im_floater"
- help_topic="im_floater"
- save_rect="true"
- title="Instant Message"
- width="419">
-    <multi_floater.string
-     name="only_user_message">
-        You are the only Resident in this session.
-    </multi_floater.string>
-    <multi_floater.string
-     name="offline_message">
-        [FIRST] [LAST] is offline.
-    </multi_floater.string>
-    <multi_floater.string
-     name="invite_message">
-        Click the [BUTTON NAME] button to accept/connect to this voice chat.
-    </multi_floater.string>
-    <multi_floater.string
-     name="muted_message">
-        You have blocked this Resident. Sending a message will automatically unblock them.
-    </multi_floater.string>
-    <multi_floater.string
-     name="generic_request_error">
-        Error making request, please try again later.
-    </multi_floater.string>
-    <multi_floater.string
-     name="insufficient_perms_error">
-        You do not have sufficient permissions.
-    </multi_floater.string>
-    <multi_floater.string
-     name="session_does_not_exist_error">
-        The session no longer exists
-    </multi_floater.string>
-    <multi_floater.string
-     name="no_ability_error">
-        You do not have that ability.
-    </multi_floater.string>
-    <multi_floater.string
-     name="not_a_mod_error">
-        You are not a session moderator.
-    </multi_floater.string>
-    <multi_floater.string
-     name="muted_error">
-        A group moderator disabled your text chat.
-    </multi_floater.string>
-    <multi_floater.string
-     name="add_session_event">
-        Unable to add Residents to chat session with [RECIPIENT].
-    </multi_floater.string>
-    <multi_floater.string
-     name="message_session_event">
-        Unable to send your message to the chat session with [RECIPIENT].
-    </multi_floater.string>
-    <multi_floater.string
-     name="removed_from_group">
-        You have been removed from the group.
-    </multi_floater.string>
-    <multi_floater.string
-     name="close_on_no_ability">
-        You no longer have the ability to be in the chat session.
-    </multi_floater.string>
-    <tab_container
-     follows="left|top|right|bottom"
-     height="406"
-     layout="topleft"
-     left="1"
-     name="Preview Tabs"
-     tab_position="bottom"
-     top="16"
-     width="417" />
-</multi_floater>
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 6c1214f152..a371e98322 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -30,12 +30,19 @@
   top="20"
   left="0">
     <layout_panel
-      name="panel_im_control_panel"
-      layout="topleft"
-      follows="left"
-      min_width="115" 
+      name="im_control_panel_holder"
+      min_width="115"
+      width="150" 
+      height="320" 
       auto_resize="false"
-      user_resize="true" />
+      user_resize="false">
+      <panel
+        name="panel_im_control_panel"
+        layout="topleft"
+        height="320"
+        width="150" 
+        follows="all"/>
+      </layout_panel>
     <layout_panel
        default_tab_group="3"
        left="0"
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index 24fff6d4ae..81194f61cf 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -8,7 +8,7 @@
  layout="topleft"
  name="incoming call"
  help_topic="incoming_call"
- title="UNKNOWN PERSON IS CALLING"
+ title="Incoming call"
  width="410">
     <floater.string
      name="lifetime">
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index 366098013b..2ef52bf539 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@@ -106,6 +106,7 @@
      left_delta="78"
      name="LabelCreatorName"
      top_delta="0"
+     use_ellipses="true" 
      width="170">
         Nicole Linden
     </text>
@@ -139,8 +140,9 @@
      left_delta="78"
      name="LabelOwnerName"
      top_delta="0"
+     use_ellipses="true"
      width="170">
-        Thrax Linden
+      Thrax Linden
     </text>
     <button
      follows="top|right"
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index 1b21b97092..49e835cce4 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -9,7 +9,7 @@
  name="floater_about"
  help_topic="floater_about"
  save_rect="true"
- single_instance="true"
+ auto_tile="true"
  title="MEDIA BROWSER"
  width="820">
     <floater.string
@@ -26,10 +26,12 @@
      layout="topleft"
      left="10"
      name="stack1"
+     orientation="vertical" 
      top="20"
      width="800">
         <layout_panel
          auto_resize="false"
+         default_tab_group="1" 
          height="20"
          layout="topleft"
          left="0"
@@ -78,11 +80,13 @@
             <combo_box
              allow_text_entry="true"
              follows="left|top|right"
+             tab_group="1"
              height="20"
              layout="topleft"
              left_pad="5"
              max_chars="1024"
              name="address"
+             combo_editor.select_on_focus="true"
              top_delta="0"
              width="540">
 				<combo_box.commit_callback
@@ -192,9 +196,9 @@
          top_delta="0"
          user_resize="false"
          width="540">
-            <web_browser
+          <web_browser
              bottom="-30"
-             follows="left|right|top|bottom"
+             follows="all"
              layout="topleft"
              left="0"
              name="browser"
diff --git a/indra/newview/skins/default/xui/en/floater_my_friends.xml b/indra/newview/skins/default/xui/en/floater_my_friends.xml
deleted file mode 100644
index e7efcc7844..0000000000
--- a/indra/newview/skins/default/xui/en/floater_my_friends.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_close="false"
- can_resize="true"
- height="390"
- layout="topleft"
- min_height="240"
- min_width="365"
- name="floater_my_friends"
- help_topic="floater_my_friends"
- save_rect="true"
- single_instance="true"
- title="CONTACTS"
- width="395">
-    <tab_container
-     follows="all"
-     height="364"
-     layout="topleft"
-     left="4"
-     name="friends_and_groups"
-     tab_position="top"
-     tab_width="80"
-     top="20"
-     width="383">
-        <panel
-         bottom="364"
-         filename="panel_friends.xml"
-         label="Friends"
-         layout="topleft"
-         left="0"
-         help_topic="my_friends_friends_tab"
-         name="friends_panel"
-         width="370" />
-        <panel
-         bottom="364"
-         filename="panel_groups.xml"
-         label="Groups"
-         layout="topleft"
-         left="0"
-         help_topic="my_friends_groups_tab"
-         name="groups_panel"
-         width="370" />
-    </tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_notifications_console.xml b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
index ca81b9bcf0..e243ccd2f9 100644
--- a/indra/newview/skins/default/xui/en/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
@@ -36,6 +36,7 @@
      follows="left|right|top|bottom"
      layout="topleft"
      left="5"
+     orientation="vertical" 
      name="notification_channels"
      right="-5"
      top="42" />
diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml
index 509cffe490..7ab565313e 100644
--- a/indra/newview/skins/default/xui/en/floater_pay.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay.xml
@@ -7,7 +7,7 @@
  name="Give Money"
  help_topic="give_money"
  save_rect="true"
- width="225">
+ width="250">
    <string
     name="payee_group">
         Pay Group
@@ -16,28 +16,7 @@
     name="payee_resident">
         Pay Resident
    </string>
-   <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="18"
-     layout="topleft"
-     left="12"
-     name="payee_label"
-     top="22"
-     width="75">
-        Pay:
-    </text>
-   <icon
-     height="16"
-     width="16"
-     image_name="Generic_Person"
-     mouse_opaque="true"
-     name="icon_person"
-     tool_tip="Person"
-     top_pad="0"
-     left="10"
-     />
+
     <text
      type="string"
      length="1"
@@ -45,17 +24,19 @@
      font="SansSerifSmall"
      height="16"
      layout="topleft"
-     left_pad="7"
+     left="10"
      name="payee_name"
-     width="210">
-        [FIRST] [LAST]
+     top="25" 
+     use_ellipses="true"
+     width="230">
+        Test Name That Is Extremely Long To Check Clipping
     </text>
     <button
      height="23"
      label="L$1"
      label_selected="L$1"
      layout="topleft"
-     left="25"
+     left="35"
      name="fastpay 1"
      top_pad="8"
      width="80" />
@@ -72,7 +53,7 @@
      label="L$10"
      label_selected="L$10"
      layout="topleft"
-     left="25"
+     left="35"
      name="fastpay 10"
      top_pad="8"
      width="80" />
@@ -90,7 +71,7 @@
      follows="left|top"
      height="18"
      layout="topleft"
-     left="25"
+     left="35"
      name="amount text"
      top_pad="8"
      width="180">
@@ -102,7 +83,7 @@
      height="19"
      top_pad="0"
      layout="topleft"
-     left="120"
+     left="130"
      max_length="9"
      name="amount"
      width="80" />
@@ -112,16 +93,16 @@
      label="Pay"
      label_selected="Pay"
      layout="topleft"
-     left="10"
+     left="20"
      name="pay btn"
-     top_pad="5"
+     top_pad="15"
      width="100" />
     <button
      height="23"
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
-     left_pad="5"
+     left_pad="10"
      name="cancel btn"
      width="100" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml
index d09a0a0535..d8cfed7b09 100644
--- a/indra/newview/skins/default/xui/en/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml
@@ -2,12 +2,12 @@
 <floater
  legacy_header_height="18"
  can_minimize="false"
- height="220"
+ height="225"
  layout="topleft"
  name="Give Money"
  help_topic="give_money"
  save_rect="true"
- width="225">
+ width="250">
     <string
      name="payee_group">
         Pay Group
@@ -16,27 +16,16 @@
      name="payee_resident">
         Pay Resident
     </string>
-   <icon
-     height="16"
-     width="16"
-     image_name="Generic_Person"
-     mouse_opaque="true"
-     name="icon_person"
-     tool_tip="Person"
-     top_pad="24"
-     left="10"
-     />
     <text
-     type="string"
-     length="1"
      follows="left|top"
      height="16"
      layout="topleft"
-     left_pad="7"
-     top_delta="3"
+     left="10"
+     top_pad="24"
      name="payee_name"
-     width="184">
-      [FIRST] [LAST]
+     use_ellipses="true" 
+     width="225">
+      Ericacita Moostopolison
     </text>
     <text
      type="string"
@@ -45,9 +34,9 @@
      halign="left"
      height="14"
      layout="topleft"
-     left="34"
+     left="10"
      name="object_name_label"
-     top_pad="0"
+     top_pad="5"
      width="180">
         Via object:
     </text>
@@ -58,7 +47,7 @@
      mouse_opaque="true"
      name="icon_object"
      tool_tip="Objects"
-     top_pad="0"
+     top_pad="5"
      left="10"
      />
     <text
diff --git a/indra/newview/skins/default/xui/en/floater_preview_classified.xml b/indra/newview/skins/default/xui/en/floater_preview_classified.xml
deleted file mode 100644
index 2017cf2bd1..0000000000
--- a/indra/newview/skins/default/xui/en/floater_preview_classified.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- auto_tile="true"
- height="510"
- layout="topleft"
- name="classified_preview"
- help_topic="classified_preview"
- save_rect="true"
- title="CLASSIFIED INFORMATION"
- width="440">
-    <floater.string
-     name="Title">
-        Classified: [NAME]
-    </floater.string>
-    <panel
-     follows="bottom|left"
-     height="470"
-     layout="topleft"
-     left="0"
-     name="classified_details_panel"
-     top="20"
-     width="440" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preview_event.xml b/indra/newview/skins/default/xui/en/floater_preview_event.xml
deleted file mode 100644
index a4066b34c5..0000000000
--- a/indra/newview/skins/default/xui/en/floater_preview_event.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- auto_tile="true"
- height="510"
- layout="topleft"
- name="event_preview"
- help_topic="event_preview"
- save_rect="true"
- title="EVENT INFORMATION"
- width="440">
-    <floater.string
-     name="Title">
-        Event: [NAME]
-    </floater.string>
-    <panel
-     follows="bottom|left"
-     height="470"
-     layout="topleft"
-     left="0"
-     name="event_details_panel"
-     top="20"
-     width="440" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml
deleted file mode 100644
index 66408a5057..0000000000
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="false"
- follows="left|top"
- height="155"
- layout="topleft"
- name="Gesture"
- help_topic="gesture"
- save_rect="true"
- title="GESTURE SHORTCUT"
- width="260">
-    <scroll_list
-     follows="top|left"
-     height="110"
-     layout="topleft"
-     left="10"
-     name="library_list"
-     top="10"
-     width="240">
-        <scroll_list.rows
-         value="Animation" />
-        <scroll_list.rows
-         value="Sound" />
-        <scroll_list.rows
-         value="Chat" />
-        <scroll_list.rows
-         value="Wait" />
-    </scroll_list>
-    <!--button
-     follows="top|left"
-     height="20"
-     label="Preview"
-     layout="topleft"
-     left="20"
-     name="preview_btn"
-     top_pad="50"
-     width="80" />
-    <button
-     follows="top|left"
-     height="20"
-     label="Save"
-     layout="topleft"
-     left_pad="5"
-     name="save_btn"
-     top_delta="0"
-     width="80" />
-    <button
-     follows="top|left"
-     height="20"
-     label="Cancel (not working)"
-     layout="topleft"
-     left_pad="5"
-     name="save_btn"
-     top_delta="0"
-     width="80" /-->   
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml
deleted file mode 100644
index 26252a7a16..0000000000
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="false"
- follows="left|top"
- height="90"
- layout="topleft"
- name="Gesture"
- help_topic="gesture"
- save_rect="true"
- title="GESTURE SHORTCUT"
- width="260">
-      <text
-     type="string"
-     length="1"
-     follows="top|left"
-     font="SansSerifSmall"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="trigger_label"
-     top_pad="10"
-     width="100">
-        Chat:
-    </text>
-    <line_editor
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="5"
-     max_length="31"
-     name="trigger_editor"
-     top_delta="-4"
-     width="135" />
-    <text
-     type="string"
-     length="1"
-     follows="top|left"
-     font="SansSerifSmall"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="key_label"
-     top_pad="10"
-     width="100">
-        Keyboard:
-    </text>
-    <combo_box
-     height="20"
-     label="None"
-     layout="topleft"
-     left_pad="13"
-     name="modifier_combo"
-     top_delta="-4"
-     width="50" />
-    <combo_box
-     height="20"
-     label="None"
-     layout="topleft"
-     left_pad="5"
-     name="key_combo"
-     top_delta="0"
-     width="45" />
-    <text
-     type="string"
-     length="1"
-     follows="top|left"
-     font="SansSerifSmall"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="replace_text"
-     tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!"
-     top_pad="10"
-     width="100">
-        Replace:
-    </text>
-    <line_editor
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="5"
-     max_length="31"
-     name="replace_editor"
-     tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
-     top_delta="-4"
-     width="135" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml
deleted file mode 100644
index 34f707cd2a..0000000000
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="false"
- follows="left|top"
- height="155"
- layout="topleft"
- name="Gesture"
- help_topic="gesture"
- save_rect="true"
- title="GESTURE SHORTCUT"
- width="260">
-    <scroll_list
-     follows="top|left"
-     height="110"
-     layout="topleft"
-     left="10"
-     name="step_list"
-     top_pad="10"
-     width="240" />
-    <!--text
-     type="string"
-     length="1"
-     follows="top|left"
-     font="SansSerifSmall"
-     height="60"
-     layout="topleft"
-     left="10"
-     name="help_label"
-     top_pad="10"
-     width="200">
-        All steps happen simultaneously, 
-unless you add wait steps.
-    </text-->
-    <!--text
-     follows="top|left"
-     height="60"
-     layout="topleft"
-     left="10"
-     name="options_text"
-     top_pad="10"
-     width="205" /-->
-    <!--combo_box
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     left_delta="10"
-     name="animation_list"
-     top_pad="10"
-     width="100" />
-    <combo_box
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="sound_list"
-     top_delta="10"
-     width="100" />
-    <line_editor
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     max_length="127"
-     name="chat_editor"
-     top_pad="10"
-     width="100" />
-    <radio_group
-     draw_border="false"
-     follows="top|left"
-     height="40"
-     layout="topleft"
-     left_pad="8"
-     name="animation_trigger_type"
-     top_pad="10"
-     width="80">
-        <radio_item
-         height="16"
-         label="Start"
-         layout="topleft"
-         left="3"
-         name="start"
-         top="-11"
-         width="80" />
-        <radio_item
-         height="16"
-         label="Stop"
-         layout="topleft"
-         left_delta="0"
-         name="stop"
-         top_pad="10"
-         width="80" />
-    </radio_group>
-    <check_box
-     follows="top|left"
-     height="20"
-     label="until animations are done"
-     layout="topleft"
-     left="16"
-     name="wait_anim_check"
-     top_pad="10"
-     width="100" />
-    <check_box
-     follows="top|left"
-     height="20"
-     label="time in seconds"
-     layout="topleft"
-     left_delta="0"
-     name="wait_time_check"
-     top_pad="10"
-     width="100" />
-    <line_editor
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     left_pad="5"
-     max_length="15"
-     name="wait_time_editor"
-     top_pad="10"
-     width="50" /-->   
-
-
-
-    <!--For pop out floater-->
-    <!--scroll_list
-     follows="top|left"
-     height="110"
-     layout="topleft"
-     left="10"
-     name="library_list"
-     top_pad="10"
-     width="260">
-        <scroll_list.rows
-         value="Animation" />
-        <scroll_list.rows
-         value="Sound" />
-        <scroll_list.rows
-         value="Chat" />
-        <scroll_list.rows
-         value="Wait" />
-    </scroll_list>
-    <text
-     type="string"
-     length="1"
-     follows="top|left"
-     font="SansSerifSmall"
-     height="60"
-     layout="topleft"
-     left="10"
-     name="help_label"
-     top_pad="10"
-     width="200">
-        All steps happen simultaneously, 
-unless you add wait steps.
-    </text>
-    <text
-     follows="top|left"
-     height="60"
-     layout="topleft"
-     left="10"
-     name="options_text"
-     top_pad="10"
-     width="205" />
-    <combo_box
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     left_delta="10"
-     name="animation_list"
-     top_pad="10"
-     width="100" />
-    <combo_box
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="sound_list"
-     top_delta="0"
-     width="100" />
-    <line_editor
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     max_length="127"
-     name="chat_editor"
-     top_delta="0"
-     width="100" />
-    <radio_group
-     draw_border="false"
-     follows="top|left"
-     height="40"
-     layout="topleft"
-     left_pad="8"
-     name="animation_trigger_type"
-     top="445"
-     width="80">
-        <radio_item
-         height="16"
-         label="Start"
-         layout="topleft"
-         left="3"
-         name="start"
-         top="-11"
-         width="80" />
-        <radio_item
-         height="16"
-         label="Stop"
-         layout="topleft"
-         left_delta="0"
-         name="stop"
-         top_pad="10"
-         width="80" />
-    </radio_group>
-    <check_box
-     follows="top|left"
-     height="20"
-     label="until animations are done"
-     layout="topleft"
-     left="16"
-     name="wait_anim_check"
-     top="430"
-     width="100" />
-    <check_box
-     follows="top|left"
-     height="20"
-     label="time in seconds"
-     layout="topleft"
-     left_delta="0"
-     name="wait_time_check"
-     top_delta="20"
-     width="100" />
-    <line_editor
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     left_pad="5"
-     max_length="15"
-     name="wait_time_editor"
-     top_delta="0"
-     width="50" /-->   
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index 21c0bfef48..47383c8010 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -373,7 +373,6 @@
      height="23"
      layout="topleft"
      left_delta="0"
-     max_length="32"
      name="abuser_name_edit"
      top_pad="0"
      width="195" />
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index 354f1de85e..8770ede7e9 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -38,6 +38,7 @@
          user_resize="false"
          width="630">
             <web_browser
+              trusted_content="true" 
              follows="left|right|top|bottom"
              layout="topleft"
              left="0"
diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index 4cae42bcfe..619669d28a 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -164,7 +164,7 @@
      left_delta="0"
      name="sell_to_agent"
      top_pad="4"
-     width="130" />
+     width="170" />
     <button
      height="20"
      label="Select"
diff --git a/indra/newview/skins/default/xui/en/floater_statistics.xml b/indra/newview/skins/default/xui/en/floater_statistics.xml
deleted file mode 100644
index 3a4e845141..0000000000
--- a/indra/newview/skins/default/xui/en/floater_statistics.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- follows="right|top"
- height="392"
- layout="topleft"
- mouse_opaque="false"
- name="stats floater"
- help_topic="stats_floater"
- title="STATISTICS"
- width="250" />
diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
index 1935edfcc1..95aaadfcf3 100644
--- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
@@ -41,7 +41,7 @@
      layout="topleft"
      left_delta="0"
      name="text_enabled_color_checkbox"
-     text_enabled_color="EmphasisColor"
+     label_text.text_color="EmphasisColor"
      top_pad="14"
      width="150" />
     <check_box
@@ -51,7 +51,7 @@
      layout="topleft"
      left_delta="0"
      name="text_disabled_color_checkbox"
-     text_disabled_color="EmphasisColor_35"
+     label_text.text_readonly_color="EmphasisColor_35"
      top_pad="14"
      width="150" />
     <check_box
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index fb583114c0..13c850c86c 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -79,7 +79,7 @@
    follows="top|left"
    left="10"
    height="16">
-    For widget list see https://wiki.lindenlab.com/wiki/Viewer:UI/Widgets
+    For widget list see http://wiki.secondlife.com/wiki/XUI_Reference
   </text>
 
   <!-- First column -->
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index cea2ba2c7f..4c508035be 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -253,7 +253,7 @@
      height="28"
 	 control_name="EditLinkedParts"
      label="Edit linked"
-     layout="topleft"     
+     layout="topleft"
      name="checkbox edit linked parts"
      top_pad="2">
 		  <check_box.commit_callback
@@ -770,7 +770,7 @@
 	 name="General"
 	 top="16"
 	 width="295">
-<panel.string
+	 <panel.string
 	  name="text deed continued">
 		Deed
 	 </panel.string>
@@ -862,19 +862,23 @@
              height="19"
              layout="topleft"
              name="Creator:"
+             top_pad="7"
              width="90">
                 Creator:
             </text>
+            <!-- *NOTE: Intentionally wide for long names -->
             <text
              type="string"
              length="1"
              follows="left|top"
              left_pad="0"
-             height="19"
+             height="30"
              layout="topleft"
              name="Creator Name"
-             width="175">
-                Esbee Linden
+             top_delta="0"
+             width="190"
+             word_wrap="true">
+                Mrs. Esbee Linden (esbee.linden)
             </text>
             <text
              type="string"
@@ -884,19 +888,23 @@
              height="19"
              layout="topleft"
              name="Owner:"
+             top_pad="3"
              width="90">
                 Owner:
             </text>
+            <!-- *NOTE: Intentionally wide for long names -->
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="19"
+             height="30"
              layout="topleft"
              name="Owner Name"
              left_pad="0"
-             width="175">
-                Erica Linden
+             top_delta="0"
+             width="190"
+             word_wrap="true">
+                Mrs. Erica "Moose" Linden (erica.linden)
             </text>
            <text
              type="string"
@@ -906,7 +914,7 @@
              left="10"
              height="18"
              name="Group:"
-             top_pad="4"
+             top_pad="7"
              width="75">
                 Group:
             </text>
@@ -1060,8 +1068,8 @@ even though the user gets a free copy.
          bg_alpha_color="DkGray"
          name="perms_build"
          left="0"
-         top="241"
-         height="130"
+         top_pad="4"
+         height="105"
          width="290">
             <text
              type="string"
@@ -1132,14 +1140,16 @@ even though the user gets a free copy.
              top_delta="0"
              tool_tip="Next owner can give away or resell this object"
              width="100" />
+<!-- *NOTE: These "B/O/G/E/N/F fields may overlap "perm_modify" above, 
+     but that's OK, this is used only for debugging. -->
             <text
              type="string"
              text_color="EmphasisColor"
              length="1"
-             top_pad="5"
+             top="9"
              follows="left|top"
              layout="topleft"
-             left="10"
+             left="230"
              name="B:"
              height="10"
              width="80">
@@ -1151,7 +1161,8 @@ even though the user gets a free copy.
              length="1"
              follows="left|top"
              layout="topleft"
-             left_pad="0"
+             left_delta="0"
+             top_pad="2"
              name="O:"
              height="10"
              width="80">
@@ -1163,7 +1174,8 @@ even though the user gets a free copy.
              length="1"
              follows="left|top"
              layout="topleft"
-             left_pad="0"
+             left_delta="0"
+             top_pad="2"
              name="G:"
              height="10"
              width="80">
@@ -1174,7 +1186,7 @@ even though the user gets a free copy.
              text_color="White"
              length="1"
              follows="left|top"
-             left="10"
+             left_delta="0"
              top_pad="2"
              layout="topleft"
              name="E:"
@@ -1188,7 +1200,8 @@ even though the user gets a free copy.
              length="1"
              follows="left|top"
              layout="topleft"
-             left_pad="0"
+             left_delta="0"
+             top_pad="2"
              name="N:"
              height="10"
              width="80">
@@ -1200,7 +1213,8 @@ even though the user gets a free copy.
              length="1"
              follows="left|top"
              layout="topleft"
-             left_pad="0"
+             left_delta="0"
+             top_pad="2"
              name="F:"
              height="10"
              width="80">
@@ -1208,6 +1222,7 @@ even though the user gets a free copy.
             </text>
         </panel>
       </panel>
+      <!-- Object tab -->
       <panel
          border="false"
          follows="all"
@@ -2975,4 +2990,5 @@ even though the user gets a free copy.
          top_pad="4"
          width="125" />
  </panel>
+<!-- end of tabs -->
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index cbfaac958b..af1617eb39 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -58,6 +58,7 @@
         Please read the following Terms of Service and Privacy Policy carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement.
     </text>
     <web_browser
+      trusted_content="true" 
      follows="left|top"
      height="340"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index bf5bd87ad6..1432099590 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -86,6 +86,7 @@
              visible="true"
              width="20" />
         </layout_panel>
+        <layout_panel name="leave_call_panel" height="26" auto_resize="false">
         <layout_stack
          clip="true"
          auto_resize="false"
@@ -96,11 +97,15 @@
          name="voice_effect_and_leave_call_stack"
          orientation="horizontal"
          width="262">
-          <panel
-           class="panel_voice_effect"
-           name="panel_voice_effect"
-           visiblity_control="VoiceMorphingEnabled"
-           filename="panel_voice_effect.xml" />
+          <layout_panel
+            height="26"
+            width="200">
+            <panel
+             class="panel_voice_effect"
+             name="panel_voice_effect"
+             visiblity_control="VoiceMorphingEnabled"
+             filename="panel_voice_effect.xml" />
+          </layout_panel>
           <layout_panel
            auto_resize="false"
            user_resize="false"
@@ -118,6 +123,7 @@
              width="100" />
           </layout_panel>
         </layout_stack>
+          </layout_panel>
       <layout_panel
           follows="all"
           layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
deleted file mode 100644
index 71812bd1a6..0000000000
--- a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="0"
- can_close="false"
- can_minimize="false"
- height="100"
- layout="topleft"
- name="modal container"
- width="240">
-    <button
-     height="23"
-     label="Save"
-     label_selected="Save"
-     layout="topleft"
-     left="20"
-     name="Save"
-     top="70"
-     width="82" />
-    <button
-     height="23"
-     label="Cancel"
-     label_selected="Cancel"
-     layout="topleft"
-     left_pad="36"
-     name="Cancel"
-     top_delta="0"
-     width="82" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="30"
-     layout="topleft"
-     word_wrap="true"
-     left="20"
-     name="Save item as:"
-     top="10"
-     width="200">
-        Save item to my inventory as:
-    </text>
-    <line_editor
-     type="string"
-     length="1"
-     border_style="line"
-     border_thickness="1"
-     follows="left|top"
-     height="23"
-     layout="topleft"
-     left_delta="0"
-     max_length="63"
-     name="name ed"
-     top_pad="0"
-     width="200">
-        New [DESC]
-    </line_editor>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index 194ae151d2..853d5f8735 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -9,13 +9,13 @@
  bg_opaque_image="Inspector_Background"
  can_close="false"
  can_minimize="false"
- height="148"
+ height="164"
  layout="topleft"
  name="inspect_avatar"
  single_instance="true"
  sound_flags="0"
  visible="true"
- width="228">
+ width="245">
   <!-- Allowed fields include:
 	[BORN_ON] ("12/3/2008")
 	[SL_PROFILE] (Second Life profile),
@@ -34,15 +34,38 @@
     </string>
   <text
      follows="top|left"
-     font="SansSerifLarge"
-     height="16"
+     font="SansSerif"
+     height="20"
      left="8"
-     name="user_name"
-     top="10"
+     name="user_name_small"
+     top="7"
      text_color="White"
      use_ellipses="true"
-     value="Grumpity ProductEngine"
-     width="175" />
+     word_wrap="true"
+    visible="false" 
+     value="Grumpity ProductEngine with a long name"
+     width="185" />
+   <text
+    follows="top|left"
+    font="SansSerifBigLarge"
+    height="21"
+    left="8"
+    name="user_name"
+    top="10"
+    text_color="White"
+    use_ellipses="true"
+    value="Grumpity ProductEngine"
+    width="190" />
+   <text
+     follows="top|left"
+     height="16"
+     left="8"
+     name="user_slid"
+     font="SansSerifSmallBold"
+     text_color="EmphasisColor"
+     value="james.linden"
+     width="185"
+     use_ellipses="true" />
     <text
      follows="top|left"
      height="16"
@@ -50,6 +73,7 @@
      name="user_subtitle"
      font="SansSerifSmall"
      text_color="White"
+     top_pad="0" 
      value="11 Months, 3 days old"
      width="175"
      use_ellipses="true" />
@@ -60,9 +84,9 @@
      name="user_details"
      right="-10"
      word_wrap="true"
-     top_pad="6"
+     top_pad="4"
      use_ellipses="true"
-     width="220">This is my second life description and I really think it is great.
+     width="220">This is my second life description and I really think it is great. But for some reason my description is super extra long because I like to talk a whole lot
     </text>
     <slider
      follows="top|left"
@@ -76,7 +100,7 @@
      tool_tip="Voice volume"
      top_pad="0"
      value="0.5"
-     width="195" />
+     width="200" />
     <button
      follows="top|left"
      height="16"
@@ -108,7 +132,7 @@
      height="20"
      label="Add Friend"
      left="8"
-     top="119"
+     top="135"
      name="add_friend_btn"
      width="90" />
     <button
@@ -152,7 +176,7 @@
      width="35" />
   <panel 
     follows="top|left" 
-    top="148" 
+    top="164" 
     left="0" 
     height="60" 
     width="228" 
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a1ca910cbb..520a604bde 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -65,25 +65,24 @@
                         mouse_opaque="false"
                         name="world_stack"
                         orientation="vertical">
-            <panel auto_resize="true"
-                   follows="all"
-                   height="500"
-                   layout="topleft"
-                   tab_stop="false"
-                   mouse_opaque="false"
-                name="hud container"
-                   width="500">
-            <panel auto_resize="false"
-                   follows="left|top"
-                   height="19"
-                   left="0"
-                   mouse_opaque="false"
-                   name="topinfo_bar_container"
-                   tab_stop="false"
-                   top="0"
-                   user_resize="false"
-                   visible="false"
-                   width="1024"/>
+            <layout_panel auto_resize="true"
+                          follows="all"
+                          height="500"
+                          layout="topleft"
+                          tab_stop="false"
+                          mouse_opaque="false"
+                          user_resize="false" 
+                          name="hud container"
+                          width="500">
+              <panel follows="left|top"
+                     height="19"
+                     left="0"
+                     mouse_opaque="false"
+                     name="topinfo_bar_container"
+                     tab_stop="false"
+                     top="0"
+                     visible="false"
+                     width="1024"/>
               <panel follows="right|top|bottom"
                      height="500"
                      mouse_opaque="false"
@@ -101,10 +100,10 @@
                      name="stand_stop_flying_container"
                      visible="false"
                      width="500"/>
-            </panel>
+            </layout_panel>
             <layout_panel auto_resize="false"
-                   follows="all"
                    min_height="33"
+                   height="33" 
                    mouse_opaque="false"
                    name="bottom_tray_container"
                    visible="false"/>
@@ -112,7 +111,7 @@
         </layout_panel>
         <!-- side tray -->
         <layout_panel auto_resize="false"
-                      follows="all"
+                      follows="top|bottom"
                       height="500"
                       min_width="333"
                       mouse_opaque="false"
@@ -187,15 +186,6 @@
   <panel top="0"
          follows="all"
          height="768"
-         mouse_opaque="true"
-         name="progress_view"
-         filename="panel_progress.xml"
-         class="progress_view"
-         width="1024"
-         visible="false"/>
-  <panel top="0"
-         follows="all"
-         height="768"
          mouse_opaque="false"
          name="popup_holder"
          class="popup_holder"
@@ -208,6 +198,22 @@
           bottom="-1"
           height="11" />
   </panel>
+  <view top="0"
+        left="0"
+        width="1024"
+        height="768"
+        name="hint_holder"
+        mouse_opaque="false"
+        follows="all"/>
+  <panel top="0"
+         follows="all"
+         height="768"
+         mouse_opaque="true"
+         name="progress_view"
+         filename="panel_progress.xml"
+         class="progress_view"
+         width="1024"
+         visible="false"/>
   <menu_holder top="0"
                follows="all"
                height="768"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 19707c1bc9..ce628d93b5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -670,6 +670,14 @@
 			<menu_item_call.on_enable
                function="Tools.EnableSaveToObjectInventory" />
           </menu_item_call>
+          <menu_item_call
+			 label="Return Object"
+			 name="Return Object back to Owner">
+			<menu_item_call.on_click
+               function="Object.Return" />
+			<menu_item_call.on_enable
+               function="Object.EnableReturn" />
+          </menu_item_call>
 		</menu>
         <menu
            create_jump_keys="true"
@@ -773,6 +781,16 @@
           <menu_item_separator/>
 
                 <menu_item_check
+                 label="Show Selection Outlines"
+                 name="Show Selection Outlines">
+                    <menu_item_check.on_check
+                     function="CheckControl"
+                     parameter="RenderHighlightSelections" />
+                    <menu_item_check.on_click
+                     function="ToggleControl"
+                     parameter="RenderHighlightSelections" />
+                </menu_item_check>
+                <menu_item_check
                  label="Show Hidden Selection"
                  name="Show Hidden Selection">
                     <menu_item_check.on_check
@@ -950,6 +968,14 @@
              function="Floater.Show"
              parameter="sl_about" />
         </menu_item_call>
+        <menu_item_check
+         label="Enable Hints"
+         name="Enable Hints">
+          <on_check
+            control="EnableUIHints"/>
+          <on_click
+            function="ToggleUIHints"/>
+        </menu_item_check>
     </menu>
     <menu
      create_jump_keys="true"
@@ -2629,8 +2655,8 @@
                  function="Advanced.PrintTextureMemoryStats" />
             </menu_item_call>
             <menu_item_check
-             label="Double-Click Auto-Pilot"
-             name="Double-Click Auto-Pilot">
+             label="Double-ClickAuto-Pilot"
+             name="Double-ClickAuto-Pilot">
                 <menu_item_check.on_check
                  function="CheckControl"
                  parameter="DoubleClickAutoPilot" />
@@ -2762,6 +2788,12 @@
             <menu_item_call.on_click
              function="Advanced.SendTestIMs" />
           </menu_item_call>
+          <menu_item_call
+           label="Flush Names Caches"
+           name="Flush Names Caches">
+            <menu_item_call.on_click
+             function="Advanced.FlushNameCaches" />
+          </menu_item_call>
         </menu>
         <menu
          create_jump_keys="true"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 609a9b09be..83cbcb3344 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" ?><notifications>
-
-  <global name="skipnexttime">
+    <global name="skipnexttime">
 
 		Don&apos;t show me this again
   </global>
@@ -97,7 +96,7 @@
   </template>
 
   <notification
-   functor="GenericAcknowledge"
+ functor="GenericAcknowledge"
    icon="alertmodal.tga"
    name="MissingAlert"
    label="Unknown Notification Message"
@@ -257,7 +256,7 @@ Save all changes to clothing/body parts?
    name="GrantModifyRights"
    type="alertmodal">
 Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
-Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
+Do you want to grant modify rights for [NAME]?
     <usetemplate
      name="okcancelbuttons"
      notext="No"
@@ -280,7 +279,7 @@ Do you want to grant modify rights for the selected Residents?
    icon="alertmodal.tga"
    name="RevokeModifyRights"
    type="alertmodal">
-Do you want to revoke modify rights for [FIRST_NAME] [LAST_NAME]?
+Do you want to revoke modify rights for [NAME]?
     <usetemplate
      name="okcancelbuttons"
      notext="No"
@@ -717,13 +716,13 @@ You can not wear that item because it has not yet loaded. Please try again in a
    name="MustHaveAccountToLogIn"
    type="alertmodal">
 Oops! Something was left blank.
-You need to enter both the First and Last name of your avatar.
+You need to enter the Username name of your avatar.
 
 You need an account to enter [SECOND_LIFE]. Would you like to create one now?
     <url
 	option="0"
 	name="url"
-	openexternally = "1">
+	target = "_external">
 
 			http://join.secondlife.com/
     </url>
@@ -737,7 +736,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now?
    icon="alertmodal.tga"
    name="InvalidCredentialFormat"
    type="alertmodal">
-You need to enter both the First and Last name of your avatar into the Username field, then login again.
+You need to enter either the Username or both the First and Last name of your avatar into the Username field, then login again.
   </notification>
   
 
@@ -2021,20 +2020,6 @@ You do not have permission to buy land for your active group.
   <notification
    icon="alertmodal.tga"
    label="Add Friend"
-   name="AddFriend"
-   type="alertmodal">
-Friends can give permissions to track each other on the map and receive online status updates.
-
-Offer friendship to [NAME]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Add Friend"
    name="AddFriendWithMessage"
    type="alertmodal">
 Friends can give permissions to track each other on the map and receive online status updates.
@@ -2060,7 +2045,8 @@ Would you be my friend?
  icon="alertmodal.tga"
  label="Save Outfit"
  name="SaveOutfitAs"
- type="alertmodal">
+ type="alertmodal"
+ unique="true">
     Save what I'm wearing as a new Outfit:
     <form name="form">
       <input name="message" type="text">
@@ -2076,7 +2062,6 @@ Would you be my friend?
        name="Cancel"
        text="Cancel"/>
     </form>
-    <unique/>
   </notification>
 
   <notification
@@ -2128,7 +2113,7 @@ Would you be my friend?
    icon="alertmodal.tga"
    name="RemoveFromFriends"
    type="alertmodal">
-Do you want to remove [FIRST_NAME] [LAST_NAME] from your Friends List?
+Do you want to remove [NAME] from your Friends List?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -2381,7 +2366,7 @@ Deed this [AREA] m² of land to the group &apos;[GROUP_NAME]&apos;?
    name="DeedLandToGroupWithContribution"
    type="alertmodal">
 By deeding this parcel, the group will be required to have and maintain sufficient land use credits.
-The deed will include a simultaneous land contribution to the group from &apos;[FIRST_NAME] [LAST_NAME]&apos;.
+The deed will include a simultaneous land contribution to the group from &apos;[NAME]&apos;.
 The purchase price of the land is not refunded to the owner. If a deeded parcel is sold, the sale price will be divided evenly among group members.
 
 Deed this [AREA] m² of land to the group &apos;[GROUP_NAME]&apos;?
@@ -3201,6 +3186,88 @@ You are no longer frozen.
 
   <notification
    icon="alertmodal.tga"
+   name="SetDisplayNameSuccess"
+   type="alert">
+Hi [DISPLAY_NAME]!
+
+Just like in real life, it takes a while for everyone to learn about a new name.  Please allow several days for [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] in objects, scripts, search, etc.
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ name="SetDisplayNameBlocked"
+ type="alert">
+Sorry, you cannot change your display name. If you feel this is in error, please contact support.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameFailedLength"
+   type="alertmodal">
+Sorry, that name is too long.  Display names can have a maximum of [LENGTH] characters.
+
+Please try a shorter name.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameFailedGeneric"
+   type="alertmodal">
+    Sorry, we could not set your display name.  Please try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameMismatch"
+   type="alertmodal">
+    The display names you entered do not match. Please re-enter.
+  </notification>
+
+  <!-- *NOTE: This should never happen -->
+  <notification
+   icon="alertmodal.tga"
+   name="AgentDisplayNameUpdateThresholdExceeded"
+   type="alertmodal">
+Sorry, you have to wait longer before you can change your display name.
+
+See http://wiki.secondlife.com/wiki/Setting_your_display_name
+
+Please try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AgentDisplayNameSetBlocked"
+   type="alertmodal">
+ Sorry, we could not set your requested name because it contains a banned word.
+ 
+ Please try a different name.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+ name="AgentDisplayNameSetInvalidUnicode"
+ type="alertmodal">
+    The display name you wish to set contains invalid characters.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+ name="AgentDisplayNameSetOnlyPunctuation"
+ type="alertmodal">
+    Your display name must contain letters other than punctuation.
+  </notification>
+
+
+  <notification
+   icon="notifytip.tga"
+   name="DisplayNameUpdate"
+   type="notifytip">
+    [OLD_NAME] ([SLID]) is now known as [NEW_NAME].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="OfferTeleport"
    type="alertmodal">
 Offer a teleport to your location with the following message?
@@ -4011,37 +4078,37 @@ Go to your [http://secondlife.com/account/ Dashboard] to see your account histor
   <notification
    icon="alertmodal.tga"
    name="ConfirmQuit"
-   type="alertmodal">
+   type="alertmodal"
+   unique="true">
 Are you sure you want to quit?
     <usetemplate
      ignoretext="Confirm before I quit"
      name="okcancelignore"
      notext="Don&apos;t Quit"
      yestext="Quit"/>
-     <unique/>
   </notification>
 
   <notification
    icon="alertmodal.tga"
    name="DeleteItems"
-   type="alertmodal">
+   type="alertmodal"
+   unique="true">
     [QUESTION]
     <usetemplate
      ignoretext="Confirm before deleting items"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
-    <unique/>
   </notification>
 
   <notification
    icon="alertmodal.tga"
    name="HelpReportAbuseEmailLL"
-   type="alert">
+   type="alert"
+   unique="true">
 Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards].
 
 All reported abuses are investigated and resolved.
-   <unique/>
   </notification>
 
   <notification
@@ -4516,14 +4583,14 @@ Topic: [SUBJECT], Message: [MESSAGE]
    icon="notifytip.tga"
    name="FriendOnline"
    type="notifytip">
-[FIRST] [LAST] is Online
+[NAME] is Online
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="FriendOffline"
    type="notifytip">
-[FIRST] [LAST] is Offline
+[NAME] is Offline
   </notification>
 
   <notification
@@ -4679,13 +4746,6 @@ You cannot remove protected categories.
 
   <notification
    icon="notifytip.tga"
-   name="OfferedCard"
-   type="notifytip">
-You have offered a calling card to [FIRST] [LAST]
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
    name="UnableToBuyWhileDownloading"
    type="notifytip">
 Unable to buy while downloading object data.
@@ -4839,7 +4899,15 @@ Please select at least one type of content to search (General, Moderate, or Adul
 
   <notification
    icon="notify.tga"
-   name="PaymentRecived"
+   name="PaymentReceived"
+   persist="true"
+   type="notify">
+[MESSAGE]
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="PaymentSent"
    persist="true"
    type="notify">
 [MESSAGE]
@@ -4858,14 +4926,10 @@ Event Notification:
     <form name="form">
       <button
        index="0"
-       name="Teleport"
-       text="Teleport"/>
+       name="Details"
+       text="Details"/>
       <button
        index="1"
-       name="Description"
-       text="Description"/>
-      <button
-       index="2"
        name="Cancel"
        text="Cancel"/>
     </form>
@@ -4941,7 +5005,7 @@ The objects you own on the selected parcel of land have been returned back to yo
    name="OtherObjectsReturned"
    persist="true"
    type="notify">
-The objects on the selected parcel of land that is owned by [FIRST] [LAST] have been returned to his or her inventory.
+The objects on the selected parcel of land that is owned by [NAME] have been returned to his or her inventory.
   </notification>
 
   <notification
@@ -4983,47 +5047,47 @@ Message from [NAME]:
    icon="notify.tga"
    name="NotSafe"
    persist="true"
-   type="notify">
+   type="notify"
+   unique="true">
 This land has damage enabled.
 You can be hurt here. If you die, you will be teleported to your home location.
-    <unique/>
   </notification>
 
   <notification
    icon="notify.tga"
    name="NoFly"
    persist="true"
-   type="notify">
+   type="notify"
+   unique="true">
 This area has flying disabled.
 You can&apos;t fly here.
-    <unique/>
   </notification>
 
   <notification
    icon="notify.tga"
    name="PushRestricted"
    persist="true"
-   type="notify">
+   type="notify"
+   unique="true">
 This area does not allow pushing. You can&apos;t push others here unless you own the land.
-    <unique/>
   </notification>
 
   <notification
    icon="notify.tga"
    name="NoVoice"
    persist="true"
-   type="notify">
+   type="notify"
+   unique="true">
 This area has voice chat disabled. You won&apos;t be able to hear anyone talking.
-    <unique/>
   </notification>
 
   <notification
    icon="notify.tga"
    name="NoBuild"
    persist="true"
-   type="notify">
+   type="notify"
+   unique="true">
 This area has building disabled. You can&apos;t build or rez objects here.
-    <unique/>
   </notification>
 
   <notification
@@ -5267,7 +5331,7 @@ No valid parcel could be found.
    icon="notify.tga"
    name="ObjectGiveItem"
    type="offer">
-An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJECTTYPE]:
+An object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; owned by [NAME_SLURL] has given you this [OBJECTTYPE]:
 [ITEM_SLURL]
     <form name="form">
       <button
@@ -5418,7 +5482,7 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJEC
    name="OfferFriendshipNoMessage"
    persist="true"
    type="notify">
-[NAME] is offering friendship.
+[NAME_SLURL] is offering friendship.
 
 (By default, you will be able to see each other&apos;s online status.)
     <form name="form">
@@ -5511,7 +5575,7 @@ Load web page [URL]?
 
 [MESSAGE]
 
-From object: [OBJECTNAME], owner: [NAME]?
+From object: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, owner: [NAME]?
     <form name="form">
       <button
        index="0"
@@ -5553,7 +5617,7 @@ The item you are trying to wear uses a feature that your Viewer can&apos;t read.
    name="ScriptQuestion"
    persist="true"
    type="notify">
-&apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
+&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, would like to:
 
 [QUESTIONS]
 Is this OK?
@@ -5579,7 +5643,7 @@ Is this OK?
    priority="high"
    persist="true"
    type="notify">
-An object named &apos;[OBJECTNAME]&apos;, owned by &apos;[NAME]&apos; would like to:
+An object named &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, owned by &apos;[NAME]&apos; would like to:
 
 [QUESTIONS]
 If you do not trust this object and its creator, you should deny the request.
@@ -5606,7 +5670,7 @@ Grant this request?
    icon="notify.tga"
    name="ScriptDialog"
    type="notify">
-[FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
+[NAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
 [MESSAGE]
     <form name="form">
       <button
@@ -5620,7 +5684,7 @@ Grant this request?
    icon="notify.tga"
    name="ScriptDialogGroup"
    type="notify">
-[GROUPNAME]&apos;s &apos;[TITLE]&apos;
+[GROUPNAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
 [MESSAGE]
     <form name="form">
       <button
@@ -5836,7 +5900,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
    name="AutoUnmuteByIM"
    persist="true"
    type="notify">
-[FIRST] [LAST] was sent an instant message and has been automatically unblocked.
+[NAME] was sent an instant message and has been automatically unblocked.
   </notification>
 
   <notification
@@ -5844,7 +5908,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
    name="AutoUnmuteByMoney"
    persist="true"
    type="notify">
-[FIRST] [LAST] was given money and has been automatically unblocked.
+[NAME] was given money and has been automatically unblocked.
   </notification>
 
   <notification
@@ -5852,7 +5916,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
    name="AutoUnmuteByInventory"
    persist="true"
    type="notify">
-[FIRST] [LAST] was offered inventory and has been automatically unblocked.
+[NAME] was offered inventory and has been automatically unblocked.
   </notification>
 
   <notification
@@ -5944,9 +6008,9 @@ The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum
   <notification
    icon="notifytip.tga"
    name="ProximalVoiceChannelFull"
-   type="notifytip">
+   type="notifytip"
+   unique="true">
 We&apos;re sorry.  This area has reached maximum capacity for voice conversations.  Please try to use voice in another area.
-    <unique/>
   </notification>
 
   <notification
@@ -6003,9 +6067,9 @@ Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now
    duration="10"
    icon="notifytip.tga"
    name="VoiceLoginRetry"
-   type="notifytip">
+   type="notifytip"
+   unique="true">
 We are creating a voice channel for you. This may take up to one minute.
-    <unique/>
   </notification>
 
   <notification
@@ -6013,10 +6077,10 @@ We are creating a voice channel for you. This may take up to one minute.
    name="VoiceEffectsExpired"
    sound="UISndAlert"
    persist="true"
-   type="notify">
+   type="notify"
+   unique="true">
 One or more of your subscribed Voice Morphs has expired.
 [[URL] Click here] to renew your subscription.
-    <unique/>
   </notification>
 
   <notification
@@ -6024,10 +6088,10 @@ One or more of your subscribed Voice Morphs has expired.
    name="VoiceEffectsExpiredInUse"
    sound="UISndAlert"
    persist="true"
-   type="notify">
+   type="notify"
+   unique="true">
 The active Voice Morph has expired, your normal voice settings have been applied.
 [[URL] Click here] to renew your subscription.
-    <unique/>
   </notification>
 
   <notification
@@ -6035,21 +6099,20 @@ The active Voice Morph has expired, your normal voice settings have been applied
    name="VoiceEffectsWillExpire"
    sound="UISndAlert"
    persist="true"
-   type="notify">
+   type="notify"
+   unique="true">
 One or more of your Voice Morphs will expire in less than [INTERVAL] days.
 [[URL] Click here] to renew your subscription.
-    <unique/>
   </notification>
-		LLNotificationsUtil::add("VoiceEffectsNew");
 
   <notification
    icon="notify.tga"
    name="VoiceEffectsNew"
    sound="UISndAlert"
    persist="true"
-   type="notify">
+   type="notify"
+   unique="true">
 New Voice Morphs are available!
-    <unique/>
   </notification>
 
   <notification
@@ -6376,8 +6439,8 @@ Are you sure you want to leave this call?
      ignoretext="Confirm before I leave call"
      name="okcancelignore"
      notext="No"
-     yestext="Yes"/>
-    <unique/>
+     yestext="Yes"
+     unique="true"/>
   </notification>
 
   <notification
@@ -6393,10 +6456,92 @@ Mute everyone?
      ignoretext="Confirm before I mute all participants in a group call"
      name="okcancelignore"
      yestext="Ok"
-     notext="Cancel"/>
-    <unique/>
+     notext="Cancel"
+     unique="true"/>
+  </notification>
+
+  <notification
+  name="HintChat"
+  label="Chat"
+  type="hint"
+  unique="true">
+    To join the conversation, type into the chat field below.
+  </notification>
+
+  <notification
+  name="HintSit"
+  label="Stand"
+  type="hint"
+  unique="true">
+    To stand up and exit the sitting position, click the Stand button.
+  </notification>
+
+  <notification
+  name="HintDestinationGuide"
+  label="Explore the World"
+  type="hint"
+  unique="true">
+    The Destination Guide contains thousands of new places to discover. Select a location and choose Teleport to start exploring.
+  </notification>
+
+  <notification
+    name="HintSidePanel"
+    label="Side Panel"
+    type="hint"
+    unique="true">
+    Get quick access to your inventory, outfits, profiles and more in the side panel.
+  </notification>
+
+  <notification
+  name="HintMove"
+  label="Move"
+  type="hint"
+  unique="true">
+    To walk or run, open the Move Panel and use the directional arrows to navigate. You can also use the directional keys on your keyboard.
   </notification>
 
+  <notification
+  name="HintDisplayName"
+  label="Display Name"
+  type="hint"
+  unique="true">
+    Set your customizable display name here. This is in addition to your unique username, which can't be changed. You can change how you see other people's names in your preferences.
+  </notification>
+
+  <notification
+  name="HintInventory"
+  label="Inventory"
+  type="hint"
+  unique="true">
+    Check your inventory to find items. Newest items can be easily found in the Recent tab.
+  </notification>
+
+  <notification
+  name="HintLindenDollar"
+  label="You've got Linden Dollars!"
+  type="hint"
+  unique="true">
+    Here's your current balance of L$. Click Buy L$ to purchase more Linden Dollars.
+  </notification>
+
+  <notification
+  name="PopupAttempt"
+  icon="Popup_Caution"
+  type="browser">
+    A pop-up was prevented from opening.
+    <form name="form">
+      <ignore name="ignore"
+              control="MediaEnablePopups"
+              invert_control="false"
+              text="Enable all pop-ups"/>
+      <button default="true"
+              index="0"
+              name="open"
+              text="Open pop-up window"/>
+    </form>
+  </notification>
+
+  
   <global name="UnsupportedCPU">
 - Your CPU speed does not meet the minimum requirements.
   </global>
diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
index bef5f8dafd..3e3271b181 100644
--- a/indra/newview/skins/default/xui/en/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
@@ -53,6 +53,7 @@
     top="10"
     left_pad="20"
     height="14"
+    parse_urls="false"
     width="245"
     length="1"
     follows="right|left"
diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
index 3416b2369d..72f41c62f4 100644
--- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml
+++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
@@ -71,7 +71,7 @@
 		top="10"
 		left_pad="10"
 		height="14"
-		width="255"
+		width="250"
 		length="1"
 		follows="right|left"
 		use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/panel_audio_device.xml b/indra/newview/skins/default/xui/en/panel_audio_device.xml
deleted file mode 100644
index 546f46205f..0000000000
--- a/indra/newview/skins/default/xui/en/panel_audio_device.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="240"
- layout="topleft"
- left="8"
- name="device_settings"
- top="240"
- width="404">
-    <panel.string
-     name="default_text">
-        Default
-    </panel.string>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="6"
-     name="Audio Devices"
-     width="200">
-        Audio Devices
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="20"
-     name="Input device (microphone):"
-     top="26"
-     width="200">
-        Input device (microphone):
-    </text>
-    <combo_box
-     height="18"
-     layout="topleft"
-     left_delta="0"
-     max_chars="128"
-     name="voice_input_device"
-     top_pad="2"
-     width="225" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="0"
-     name="Output device (speakers):"
-     top_pad="9"
-     width="200">
-        Output device (speakers):
-    </text>
-    <combo_box
-     height="18"
-     layout="topleft"
-     left_delta="0"
-     max_chars="128"
-     name="voice_output_device"
-     top_pad="2"
-     width="225" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="6"
-     name="Input level:"
-     top="121"
-     width="200">
-        Input Level
-    </text>
-    <text_editor
-     type="string"
-     length="1"
-	 top="135"
-     bg_readonly_color="0 0 0 0"
-     enabled="false"
-     height="60"
-     border_visible="false"
-     layout="topleft"
-     left_delta="10"
-     max_length="65535"
-     name="voice_intro_text1"
-     tab_stop="false"
-     width="380"
-     word_wrap="true">
-        Adjust the slider to control how loud you sound to other Residents. To test the input level, simply speak into your microphone.
-    </text_editor>
-    <slider_bar
-     follows="left|top"
-     height="17"
-     increment="0.05"
-     initial_value="1.0"
-     layout="topleft"
-     left_delta="5"
-     max_val="2"
-     name="mic_volume_slider"
-     tool_tip="Change the volume using this slider"
-     top="202"
-     width="90" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="5"
-     name="wait_text"
-     top_delta="1"
-     width="200">
-        Please wait
-    </text>
-    <locate
-     height="20"
-     layout="topleft"
-     left_delta="0"
-     name="bar0"
-     top_delta="5"
-     width="20" />
-    <locate
-     height="20"
-     layout="topleft"
-     left_pad="2"
-     name="bar1"
-     top_delta="0"
-     width="20" />
-    <locate
-     height="20"
-     layout="topleft"
-     left_pad="2"
-     name="bar2"
-     top_delta="0"
-     width="20" />
-    <locate
-     height="20"
-     layout="topleft"
-     left_pad="2"
-     name="bar3"
-     top_delta="0"
-     width="20" />
-    <locate
-     height="20"
-     layout="topleft"
-     left_pad="2"
-     name="bar4"
-     top_delta="0"
-     width="20" />
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index cdd596222d..63068a069f 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -32,31 +32,32 @@
      orientation="horizontal"
      top="0"
      width="1310">
-        <icon
+        <layout_panel
          auto_resize="false"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
+         user_resize="false" 
          min_width="2"
-         top="0"
          width="2" />
         <layout_panel
          auto_resize="false"
-         filename="panel_nearby_chat_bar.xml"
-         follows="left|right"
-         height="28"
          layout="topleft"
-         left="0"
          max_width="320"
-         min_height="23"
          min_width="214"
+         height="28" 
          mouse_opaque="false"
-         name="chat_bar"
-         top="4"
+		 name="chat_bar_layout_panel"
          user_resize="true"
-         width="308" />
+         width="308" >
+          <panel
+         name="chat_bar"
+            filename="panel_nearby_chat_bar.xml"
+            left="0"
+            height="28"
+            width="308"
+            top="0"
+            mouse_opaque="false"
+            follows="left|right"
+          />
+        </layout_panel>
         <!--
         There is resize bar between chatbar and Speak button. It has 2px width (is is set as 2*UIResizeBarOverlap)
         -->
@@ -404,18 +405,10 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
                  width="7" />
             </chiclet_panel>
         </layout_panel>
-        <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         min_width="4"
-         name="DUMMY"
-         top="0"
-         width="4" />
+        <layout_panel auto_resize="false"
+                      user_resize="false" 
+                      width="4"
+                      min_width="4"/>
         <layout_panel
          auto_resize="false"
          follows="right"
@@ -507,17 +500,11 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                 </button>
             </chiclet_notification>
         </layout_panel>
-      <icon
+      <layout_panel
          auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
+         user_resize="false" 
          min_width="4"
          name="DUMMY2"
-         top="0"
          width="8" />
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
index 6e9476f814..efb1da4c05 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
@@ -28,30 +28,28 @@
      orientation="horizontal"
      top="0"
      width="1000">
-        <icon
+        <layout_panel
          auto_resize="false"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
+         user_resize="false" 
          min_width="2"
-         left="0"
-         top="0"
          width="2" />
         <layout_panel
          mouse_opaque="false"
          auto_resize="true"
-         follows="left|right"
          height="28"
          layout="topleft"
-         left="0"
-         min_height="23"
          width="310"
-         top="4"
          min_width="188"
-         name="chat_bar"
-         user_resize="false"
-         filename="panel_nearby_chat_bar.xml" />
+         user_resize="false">
+          <panel
+            left="0"
+            filename="panel_nearby_chat_bar.xml"
+            follows="left|right"
+            top="4"
+            width="310"
+            name="chat_bar"
+            mouse_opaque="false"/>
+        </layout_panel>
         <layout_panel
          mouse_opaque="false"
          auto_resize="false"
@@ -79,17 +77,11 @@
                  use_ellipses="true" />
             </gesture_combo_list>
         </layout_panel>
-        <icon
+        <layout_panel
          auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
+         user_resize="false" 
          min_width="3"
          name="after_gesture_panel"
-         top="0"
          width="3"/>
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 903dcd4c24..90dbddaff7 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  class="edit_profile_panel"
   follows="all"
- height="535"
+ height="585"
  label="Profile Edit"
  layout="topleft"
  left="0"
@@ -60,7 +60,7 @@
  <scroll_container
      color="DkGray2"
      follows="all"
-     height="494"
+     height="537"
      min_height="300"
      layout="topleft"
      left="8"
@@ -74,7 +74,7 @@
          follows="left|top|right"
          layout="topleft"
          top="0"
-     height="494"
+     height="537"
      min_height="300"
          left="0"
          width="292">
@@ -83,16 +83,110 @@
      follows="left|top|right"
          layout="topleft"
          top="0"
-     height="494"
+     height="537"
      min_height="300"
          left="0"
          width="292">
+      <text
+     top="5"
+     follows="top|left"
+     height="13"
+     layout="topleft"
+     left="10"
+     name="display_name_label"
+     text_color="LtGray"
+     value="Display Name:"
+     width="80" />
+      <text
+     top="5"
+     follows="top|left"
+     height="13"
+     layout="topleft"
+     left="10"
+     name="solo_username_label"
+     text_color="LtGray"
+     value="Username:"
+     visible="false" 
+     width="80" />
+      <button
+         name="set_name"
+         layout="topleft"
+         follows="top|left"
+         image_overlay="Edit_Wrench"
+         top="21"
+         left="10"
+         height="23"
+         width="23"
+         tool_tip="Set Display Name"/>
+      <text
+       follows="top|left"
+       font="SansSerifBigBold"
+       height="20"
+       layout="topleft"
+       left="10"
+       name="solo_user_name"
+       text_color="white"
+       top_delta="3"
+       value="Hamilton Hitchings"
+       use_ellipses="true"
+       visible="false"
+       width="275" />
+      <text
+       follows="top|left"
+       font="SansSerifBigBold"
+       height="20"
+       layout="topleft"
+       left="43"
+       name="user_name"
+       text_color="white"
+       top_delta="0"
+       value="Hamilton Hitchings"
+       use_ellipses="true"
+       visible="true"
+       width="250" />
+      <text
+       follows="top|left"
+       font="SansSerifBold"
+       height="20"
+       layout="topleft"
+       left_delta="0"
+       name="user_name_small"
+       text_color="white"
+       top_delta="-4"
+       value="Hamilton Hitchings"
+       use_ellipses="true"
+       visible="false"
+       wrap="true"
+       width="245" />
+      <text
+    follows="top|left"
+    height="13"
+    layout="topleft"
+    left="10"
+    name="user_label"
+    text_color="LtGray"
+    top_pad="8"
+    value="Username:"
+    width="70" />
+      <text
+       follows="top|left"
+       height="20"
+       layout="topleft"
+       left_pad="0"
+       name="user_slid"
+       text_color="EmphasisColor"
+        font="SansSerifBold"
+       top_delta="-2"
+       use_ellipses="true" 
+       value="hamilton.linden"
+       wrap="true" 
+       width="205" />
      <panel
        name="lifes_images_panel"
          follows="left|top|right"
          height="244"
          layout="topleft"
-         top="0"
+         top="65"
          left="0"
          width="292">
 	 <panel
@@ -146,8 +240,8 @@
        height="102"
        layout="topleft"
        left="123"
-       top="25"
-       max_length="511"
+       top="90"
+       max_length="512"
        name="sl_description_edit"
        width="157"
        word_wrap="true">
@@ -202,8 +296,8 @@
        height="102"
        layout="topleft"
        left="123"
-       max_length="254"
-       top="157"
+       max_length="512"
+       top="223"
        name="fl_description_edit"
        width="157"
        word_wrap="true">
@@ -242,7 +336,7 @@
        left="8"
        name="show_in_search_checkbox"
        height="15"
-       text_enabled_color="white"
+       label_text.text_color="white"
        top_pad="12"
        width="100" />
       <text
@@ -301,22 +395,22 @@
          left="10"
          name="partner_data_panel"
          width="200">
-            <name_box
-             follows="left|top|right"
-             height="30"
-             initial_value="(retrieving)"
-             layout="topleft"
-             left="0"
-             link="true"
-             name="partner_text"
-             top="0"
-             width="200"
-             word_wrap="true" />
+          <text
+           follows="left|top|right"
+           height="12"
+           initial_value="(retrieving)"
+           layout="topleft"
+           left="0"
+           name="partner_text"
+           top="0"
+           use_ellipses="true"
+           width="280"/>
          </panel>
         <text
          follows="left|top"
          height="15"
          layout="topleft"
+           link="true"
          left="10"
          name="partner_edit_link"
          value="[[URL] Edit]"
@@ -351,15 +445,15 @@
 		      user_resize="false" 
 		      auto_resize="true"
 			  width="153">
-			<button
+        <button
 		         follows="bottom|left|right"
-		         height="23"
-		         label="Save Changes"
-		         layout="topleft"
+         height="23"
+         label="Save Changes"
+         layout="topleft"
 		         left="1"
-		         name="save_btn"
+         name="save_btn"
 		         top="0"
-		         width="152" />
+         width="152" />
 		  </layout_panel>
 		  
 		  <layout_panel
@@ -372,15 +466,15 @@
 		      user_resize="false" 
 		      auto_resize="true"
 			  width="154">
-	        <button
+        <button
 		         follows="bottom|left|right"
-		         height="23"
-		         label="Cancel"
-		         layout="topleft"
+         height="23"
+         label="Cancel"
+         layout="topleft"
 		         left="1"
-		         name="cancel_btn"
+         name="cancel_btn"
 		         top="0"
-		         width="153" />
+         width="153" />
 		  </layout_panel>
 	   </layout_stack>
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 95c1c822b8..b8ef612c6c 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -463,9 +463,10 @@
                  height="23"
                  label="Undo Changes"
                  layout="topleft"
-                 left_pad="7"
+                 left="1"
                  name="revert_button"
-                 width="152" />
+                 top="0"
+                 width="148" />
             </layout_panel>
         </layout_stack>
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_friends.xml b/indra/newview/skins/default/xui/en/panel_friends.xml
deleted file mode 100644
index c315adb33e..0000000000
--- a/indra/newview/skins/default/xui/en/panel_friends.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="all"
- height="347"
- layout="topleft"
- name="friends"
- width="100">
-    <panel.string
-     name="Multiple">
-        Multiple friends
-    </panel.string>
-    <scroll_list
-     bottom="337"
-     column_padding="0"
-     draw_heading="true"
-     follows="left|top|bottom|right"
-     layout="topleft"
-     left="10"
-     multi_select="true"
-     name="friend_list"
-     right="-100"
-     search_column="1"
-     tool_tip="Hold shift or control while clicking to select multiple friends"
-     top="10">
-        <scroll_list.columns
-         image="ff_online_status_button.tga"
-         name="icon_online_status"
-         tool_tip="Online status"
-         width="20" />
-        <scroll_list.columns
-         dynamic_width="true"
-         label="Name"
-         name="friend_name"
-         tool_tip="Name" />
-        <scroll_list.columns
-         image="ff_visible_online_button.tga"
-         name="icon_visible_online"
-         tool_tip="Friend can see when you&apos;re online"
-         width="20" />
-        <scroll_list.columns
-         image="ff_visible_map_button.tga"
-         name="icon_visible_map"
-         tool_tip="Friend can locate you on the map"
-         width="20" />
-        <scroll_list.columns
-         image="ff_edit_mine_button.tga"
-         name="icon_edit_mine"
-         tool_tip="Friend can edit, delete or take objects"
-         width="20" />
-        <scroll_list.columns
-         image="ff_edit_theirs_button.tga"
-         name="icon_edit_theirs"
-         tool_tip="You can edit this friend&apos;s objects"
-         width="20" />
-        <scroll_list.columns
-         name="friend_last_update_generation"
-         width="0" />
-    </scroll_list>
-    <locate
-     bottom="7"
-     layout="topleft"
-     left="-90" />
-    <button
-     follows="top|right"
-     height="22"
-     label="IM/Call"
-     layout="topleft"
-     left_pad="10"
-     name="im_btn"
-     tool_tip="Open Instant Message session"
-     top_pad="3"
-     width="80" />
-    <button
-     follows="top|right"
-     height="22"
-     label="Profile"
-     layout="topleft"
-     left_delta="0"
-     name="profile_btn"
-     tool_tip="Show picture, groups, and other information"
-     top_pad="3"
-     width="80" />
-    <button
-     follows="top|right"
-     height="22"
-     label="Teleport"
-     layout="topleft"
-     left_delta="0"
-     name="offer_teleport_btn"
-     tool_tip="Offer this friend a teleport to your current location"
-     top_pad="3"
-     width="80" />
-    <button
-     follows="top|right"
-     height="22"
-     label="Pay"
-     layout="topleft"
-     left_delta="0"
-     name="pay_btn"
-     tool_tip="Give Linden dollars (L$) to this friend"
-     top_pad="3"
-     width="80" />
-    <button
-     follows="top|right"
-     height="22"
-     label="Remove"
-     layout="topleft"
-     left_delta="0"
-     name="remove_btn"
-     tool_tip="Remove this person from your friends list"
-     top_pad="3"
-     width="80" />
-    <button
-     follows="top|right"
-     height="22"
-     label="Add"
-     layout="topleft"
-     left_delta="0"
-     name="add_btn"
-     tool_tip="Offer friendship to a Resident"
-     top_pad="13"
-     width="80" />
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 2af1a84400..70b96ca5eb 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -33,7 +33,7 @@ Hover your mouse over the options for more help.
      height="110"
      label=""
      layout="topleft"
-     left="10"
+     left="5"
      name="insignia"
      no_commit_on_selection="true"
      tool_tip="Click to choose a picture"
@@ -49,22 +49,20 @@ Hover your mouse over the options for more help.
      type="string"
      height="16"
      length="1"
-     left_pad="10"
+     left_pad="8"
      name="prepend_founded_by"
      top_delta="0">
       Founder:
     </text>
-    <name_box
-     follows="left|top"
+     <text
+      follows="left|top"
      height="16"
-     initial_value="(retrieving)"
      layout="topleft"
-     left_delta="0"
-     link="true"
+     left_delta="-2"
      name="founder_name"
      top_pad="2"
      use_ellipses="true"
-     width="190" />
+     width="168" />
     <text
     font="SansSerifMedium"
     text_color="EmphasisColor"
@@ -92,13 +90,13 @@ Hover your mouse over the options for more help.
     <text_editor
      type="string"
      follows="left|top|right"
-     left="5"
+     left="3"
      height="80"
      layout="topleft"
      max_length="511"
      name="charter"
      top="105"
-     right="-1"
+     right="-4"
     bg_readonly_color="DkGray2"
     text_readonly_color="White"
      word_wrap="true">
@@ -113,6 +111,7 @@ Hover your mouse over the options for more help.
      layout="topleft"
      left="0"
      name="visible_members"
+     short_names="false" 
      top_pad="2">
         <name_list.columns
          label="Member"
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 64539f2134..2e57c85d6f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -60,6 +60,8 @@
      left="0"
      right="-1"
      top="0"
+     sort_column="0"
+     sort_ascending="true"
      name="group_parcel_list"
      width="313">
         <scroll_list.columns
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index 6f271a757c..cded4cf31a 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -85,6 +85,7 @@
      layout="topleft"
      left="45"
      name="attachment"
+     parse_urls="false"
      text_color="GroupNotifyTextColor"
      value="Attachment"
      use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 4af4774304..074e9bf5e5 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -85,6 +85,7 @@ clicking on their names.
              right="-1"
              multi_select="true"
              name="member_list"
+             short_names="false" 
              top_pad="5">
                 <name_list.columns
                  label="Member"
diff --git a/indra/newview/skins/default/xui/en/panel_groups.xml b/indra/newview/skins/default/xui/en/panel_groups.xml
deleted file mode 100644
index bba399481b..0000000000
--- a/indra/newview/skins/default/xui/en/panel_groups.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="all"
- height="347"
- layout="topleft"
- left="280"
- name="groups"
- top="24"
- width="350">
-    <scroll_list
-     bottom="302"
-     follows="left|top|right|bottom"
-     layout="topleft"
-     left="10"
-     name="group list"
-     top="10"
-     width="240">
-        <scroll_list.columns
-         label=""
-         name="name"
-         width="248" />
-    </scroll_list>
-    <text
-     type="string"
-     length="1"
-     follows="left|bottom"
-     height="16"
-     layout="topleft"
-     left_delta="2"
-     mouse_opaque="false"
-     name="groupdesc"
-     top_pad="7"
-     width="248">
-        Your currently active group is displayed in bold.
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|bottom"
-     height="16"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="groupcount"
-     top_pad="1"
-     width="248">
-        You belong to [COUNT] groups (of [MAX] maximum).
-    </text>
-    <locate
-     height="0"
-     layout="topleft"
-     left="-90"
-     top="7"
-     width="1" />
-    <button
-     follows="top|right"
-     height="22"
-     label="IM/Call"
-     layout="topleft"
-     left_delta="0"
-     name="IM"
-     tool_tip="Open Instant Message session"
-     top_pad="3"
-     width="80" />
-    <button
-     follows="top|right"
-     height="22"
-     label="Info"
-     layout="topleft"
-     left_delta="0"
-     name="Info"
-     top_pad="3"
-     width="80" />
-    <button
-     follows="top|right"
-     height="22"
-     label="Activate"
-     layout="topleft"
-     left_delta="0"
-     name="Activate"
-     top_pad="3"
-     width="80" />
-    <button
-     follows="top|right"
-     height="22"
-     label="Leave"
-     layout="topleft"
-     left_delta="0"
-     name="Leave"
-     top_pad="3"
-     width="80" />
-    <button
-     follows="top|right"
-     height="22"
-     label="Create..."
-     layout="topleft"
-     left_delta="0"
-     name="Create"
-     top_pad="13"
-     width="80" />
-    <button
-     follows="top|right"
-     height="22"
-     label="Search..."
-     layout="topleft"
-     left_delta="0"
-     name="Search..."
-     top_pad="3"
-     width="80" />
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_hint.xml b/indra/newview/skins/default/xui/en/panel_hint.xml
new file mode 100644
index 0000000000..e2e9d0aef0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_hint.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ width="205"
+ height="100">
+  <text name="hint_title"
+        font="SansSerifMedium" 
+        left="8"
+        right="180"
+        top="8"
+        bottom="20"
+        follows="left|right|top"
+        text_color="Black"
+        wrap="false"/>
+  <text name="hint_text"
+        left="8"
+        right="197"
+        top="26"
+        bottom="92"
+        follows="all" 
+        text_color="Black"
+        wrap="true"/>
+  <button right="197" 
+          top="8"
+          width="16" 
+          height="16"
+          name="close" 
+          follows="right|top" 
+          image_color="DkGray" 
+          image_unselected="Icon_Close_Foreground"
+          image_selected="Icon_Close_Press"/>
+</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 33a5e01e4c..9f73b7c540 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
@@ -3,11 +3,11 @@
  border="false"
  height="300"
  name="panel_im_control_panel"
- width="119">
+ width="150">
     <avatar_icon
      follows="left|top"
      height="105"
-     left_delta="5"
+     left_delta="20"
      name="avatar_icon"
      top="-5"
      width="114"/>
@@ -22,27 +22,17 @@
      name="button_stack"
      orientation="vertical"
      top_pad="5"
-     width="114">
-        <layout_panel
-         mouse_opaque="false"
-         auto_resize="true"
-         follows="top|left"
-         height="0"
-         layout="topleft"
-         left="2"
-         min_height="0"
-         width="109"
-         top="0"
-         name="spacer"
-         user_resize="false" />
+     width="145">
         <layout_panel
          auto_resize="false"
          follows="top|left|right"
          height="20"
          layout="topleft"
+         left="2" 
          min_height="20"
-         width="109"
+         width="140"
          name="view_profile_btn_panel"
+         top="0" 
          user_resize="false">
             <button
              follows="left|top|right"
@@ -50,7 +40,7 @@
              label="Profile"
              name="view_profile_btn"
              top="0"
-             width="109" />
+             width="140" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -58,7 +48,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="109"
+         width="140"
          name="add_friend_btn_panel"
          user_resize="false">
             <button
@@ -67,7 +57,7 @@
              label="Add Friend"
              name="add_friend_btn"
              top="5"
-             width="109" />
+             width="140" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -75,7 +65,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="109"
+         width="140"
          name="teleport_btn_panel"
          user_resize="false">
         <button
@@ -85,7 +75,7 @@
              label="Teleport"
              name="teleport_btn"
              tool_tip = "Offer to teleport this person"
-             width="109" />
+             width="140" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -93,7 +83,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="109"
+         width="140"
          name="share_btn_panel"
          user_resize="false">
            <button
@@ -102,7 +92,7 @@
              height="23"
              label="Share"
              name="share_btn"
-             width="109" />
+             width="140" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -110,7 +100,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="109"
+         width="140"
          name="pay_btn_panel"
          user_resize="false">
            <button
@@ -119,7 +109,7 @@
              height="23"
              label="Pay"
              name="pay_btn"
-             width="109" />
+             width="140" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -127,7 +117,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="109"
+         width="140"
          name="call_btn_panel"
          user_resize="false">
             <button
@@ -135,7 +125,7 @@
              height="23"
              label="Call"
              name="call_btn"
-             width="109" />
+             width="140" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -143,7 +133,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="109"
+         width="140"
          name="end_call_btn_panel"
          user_resize="false"
          visible="false">
@@ -152,7 +142,7 @@
              height="23"
              label="End Call"
              name="end_call_btn"
-             width="109" />
+             width="140" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -160,7 +150,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="109"
+         width="140"
          name="voice_ctrls_btn_panel"
          user_resize="false"
          visible="false">
@@ -169,7 +159,17 @@
              height="23"
              label="Voice Controls"
              name="voice_ctrls_btn"
-             width="109" />
+             width="140" />
         </layout_panel>
+      <layout_panel
+       mouse_opaque="false"
+       auto_resize="true"
+       follows="top|left"
+       height="0"
+       layout="topleft"
+       min_height="0"
+       width="140"
+       name="spacer"
+       user_resize="false" />
     </layout_stack>
 </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 34fd3352a3..021cf00d03 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -67,7 +67,7 @@
          top="8"
          use_ellipses="true"
          value="Erica Vader"
-         width="212" />
+         width="205" />
 	 <!-- TIME STAMP -->
         <text
         font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index f8ae238148..f8635b9edb 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -184,7 +184,8 @@
                  left="70"
                  name="owner"
                  top_delta="0"
-                 width="200" />
+                 use_ellipses="true" 
+                 width="215" />
                 <text
                  follows="left|top"
                  height="15"
@@ -200,7 +201,8 @@
                  left="70"
                  name="creator"
                  top_delta="0"
-                 width="200" />
+                 use_ellipses="true" 
+                 width="215" />
                 <text
                  follows="left|top"
                  height="15"
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 7e415f45a4..2ae46f79a5 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -3,7 +3,7 @@
    name="Landmarks"
    top="0"
    height="400"
-   layout="topleft"
+   layout="topleft" 
    left="0"
    width="313"
    help_topic="panel_landmarks"
@@ -88,7 +88,7 @@
         </accordion_tab>
     </accordion>
     <panel
-     background_visible="true"
+       background_visible="true"
      bevel_style="none"
      bottom="0"
      follows="left|right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 6b136495d2..a5d730711c 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -24,6 +24,8 @@ top="600"
 </panel.string>
 <!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
 <web_browser
+  tab_stop="false" 
+trusted_content="true" 
 bg_opaque_color="Black"
 border_visible="false"
 bottom="600"
@@ -65,12 +67,13 @@ Username:
 <line_editor
 follows="left|bottom"
 height="22"
-label="Username"
+label="bobsmith12 or Steller Sunshine"
 left_delta="0"
-max_length="31"
+max_length="63"
 name="username_edit"
+prevalidate_callback="ascii" 
 select_on_focus="true"
-tool_tip="[SECOND_LIFE] Username"
+tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
 top_pad="0"
 width="150" />
 <text
@@ -159,8 +162,8 @@ width="135"
 tab_stop="false"
 follows="right|bottom"
 name="links"
-width="200"
-min_width="200"
+width="205"
+min_width="205"
 user_resize="false"
 height="80">
    <text
@@ -172,7 +175,7 @@ height="16"
 top="12"
 right="-10"
 name="create_new_account_text"
-  width="180">
+  width="200">
        Sign up
  </text>
 <text
@@ -184,8 +187,8 @@ height="16"
 name="forgot_password_text"
 top_pad="12"
 right="-10"
-  width="180">
-       Forgot your name or password?
+  width="200">
+       Forgot your username or password?
 </text>
 <text
 follows="right|bottom"
@@ -196,7 +199,7 @@ height="16"
 name="login_help"
 top_pad="2"
 right="-10"
-    width="180">
+    width="200">
        Need help logging in?   </text>
 <!--  <text
     follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 37a1ed3048..1b41f602cd 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -284,7 +284,7 @@
              name="partner_data_panel"
              top_pad="0"
              width="300">
-              <name_box
+              <text
                follows="left|top"
                height="10"
                initial_value="(retrieving)"
@@ -293,8 +293,8 @@
                link="true"
                name="partner_text"
                top="0"
-           width="300"
-               word_wrap="true" />
+               use_ellipses="true" 
+           width="300" />
             </panel>
             <text
              follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
deleted file mode 100644
index 50a78e1c71..0000000000
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- All our XML is utf-8 encoded. -->
-
-<panel
-  name="nearby_chat"  visible="true" width="250" height="480" background_opaque="false"
-  background_visible="true" bevel_style="in" follows="left|top" bg_alpha_color="0.3 0.3 0.3 1.0">
-	<panel bottom="380" width="250" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="chat_caption">
-    	<text
-        	width="140" left="25" height="20" follows="left|right|top"
-        	font="SansSerifBigBold" text_color="white" word_wrap="true"
-        	mouse_opaque="true" name="sender_name" >NEARBY CHAT  </text>
-    	<icon top="25" left="180"
-      			width="20" height="20" follows="top|right"
-		      	color="1 1 1 1" enabled="true" image_name="icn_voice-groupfocus.tga"
-      			mouse_opaque="true" name="nearby_speakers_btn"/>
-    	<icon top="25" left="205"
-      		width="20" height="20" follows="top|right"
-      		color="1 1 1 1" enabled="true" image_name="inv_item_landmark_visited.tga"
-      		mouse_opaque="true" name="tearoff_btn"/>
-    	<icon top="22" left="230"
-      		width="15" height="15" follows="top|right"
-      		color="1 1 1 1" enabled="true" image_name="closebox.tga"
-      		name="close_btn"/>
-	</panel>
-  <chat_history_view bottom="0" width="250" height="320" follows="left|right|top|bottom" name="chat_scroll" />    
-</panel>
-
diff --git a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
index 3143b0a40c..c3dc588ba2 100644
--- a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
@@ -14,6 +14,9 @@
      orientation="horizontal"
      top="20"
      width="100">
+      <layout_panel name="notifications_list_panel" 
+                    width="100"
+                    user_resize="true">
         <scroll_list
          draw_heading="true"
          follows="left|right|top|bottom"
@@ -24,7 +27,6 @@
          sort_ascending="false"
          sort_column="2"
          top="0"
-         user_resize="true"
          width="100">
             <scroll_list.columns
              label="Name"
@@ -39,6 +41,10 @@
              name="date"
              width="150" />
         </scroll_list>
+      </layout_panel>
+      <layout_panel name="rejects_list_panel"
+                    width="100"
+                    user_resize="true">
         <scroll_list
          draw_heading="true"
          follows="left|right|top|bottom"
@@ -49,7 +55,6 @@
          sort_ascending="false"
          sort_column="2"
          top="0"
-         user_resize="true"
          width="100">
             <scroll_list.columns
              label="Name"
@@ -64,6 +69,7 @@
              name="date"
              width="150" />
         </scroll_list>
+      </layout_panel>
     </layout_stack>
     <button
      follows="left|right|top"
diff --git a/indra/newview/skins/default/xui/en/panel_online_status.xml b/indra/newview/skins/default/xui/en/panel_online_status.xml
deleted file mode 100644
index 14cb5fffee..0000000000
--- a/indra/newview/skins/default/xui/en/panel_online_status.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="false"
- height="152"
- label="friend_online_status"
- layout="topleft"
- left="0"
- name="friend_online_status"
- top="0"
- width="305">
-    <avatar_icon
-	 follows="top|left"
-	 height="18"
-	 image_name="Generic_Person"
-	 layout="topleft"
-	 left="3"
-	 mouse_opaque="false"
-	 name="avatar_icon"
-	 top="10"
-	 width="18" />
-    <text
-     font="SansSerifSmall"
-     follows="all"
-     height="137"
-     layout="topleft"
-     left_pad="5"
-     name="message"
-     text_color="white"
-     top="15"
-     use_ellipses="true"
-     value=""
-     width="285"
-     word_wrap="true"
-     max_length="350" />
-</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 883cbb30c6..bc050f9ad1 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -57,6 +57,7 @@
     <string
      name="replace_body_part"
      value="Click to replace your existing shape"/>
+  
 
     <button
      follows="top|left"
@@ -132,6 +133,7 @@
                  height="18"
                  layout="topleft"
                  name="curr_outfit_name"
+                 parse_urls="false"
                  text_color="LtGray"
                  top_pad="2"
                  value="[Current Outfit]"
@@ -183,6 +185,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              follows="all"
              height="185"
              width="313"
+             orientation="vertical" 
              layout="topleft"
              name="filter_panels"
              top="0"
@@ -197,19 +200,19 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                  user_resize="false"
                  visible="true">
 
-                    <!-- List containing items from the COF and Base outfit -->
-                    <panel
-                     background_visible="false"
-                     class="cof_wearables"
-                     filename="panel_cof_wearables.xml"
+            <!-- List containing items from the COF and Base outfit -->
+            <panel
+             background_visible="false"
+             class="cof_wearables"
+             filename="panel_cof_wearables.xml"
                      follows="all" 
                      height="129"
-                     layout="topleft"
-                     left="1"
-                     name="cof_wearables_list"
-                     top="0"
-                     width="311" />
-                    
+             layout="topleft"
+             left="1"
+             name="cof_wearables_list"
+             top="0"
+             width="311" />
+
                     <button
                      follows="left|bottom" 
                      height="22"
@@ -228,7 +231,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                     <combo_box
                      follows="left|right|bottom"
                      height="22"
-                     layout="topleft"
+             layout="topleft"
                      left_pad="5"
                      name="list_view_filter_combobox"
                      top_delta="0"
@@ -244,20 +247,20 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                      visible="false"
                      width="152"/>
                     
-                    <button
+            <button
                      follows="bottom|right"
                      height="22"
-                     image_overlay="Search_Icon"
+             image_overlay="Search_Icon"
                      image_pressed="PushButton_Press"
                      image_pressed_selected="PushButton_Selected_Press"
                      image_selected="PushButton_Selected_Press"
-                     is_toggle="true"
-                     layout="topleft"
-                     name="filter_button"
+             is_toggle="true"
+             layout="topleft"
+             name="filter_button"
                      right="-5"
-                     top_delta="0"
+             top_delta="0"
                      visible="false"
-                     width="20" />
+             width="20" />
                 </layout_panel>
 
                 <layout_panel
@@ -286,13 +289,13 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                     
                 </layout_panel>
             </layout_stack>
-        </layout_panel>
+                </layout_panel>
 
 
-        <layout_panel
+                <layout_panel
          background_visible="false"
          bg_alpha_color="DkGray2"
-         auto_resize="true"
+                 auto_resize="true"
          default_tab_group="3"
          height="450"
          min_height="80"
@@ -312,44 +315,44 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              top_pad="-9"
              width="313" />
 
-            <inventory_panel
-             allow_multi_select="true"
-             background_visible="false"
-             border="false"
-             follows="left|top|right|bottom"
+                    <inventory_panel
+		             allow_multi_select="true"
+		             background_visible="false"
+		             border="false"
+		             follows="left|top|right|bottom"
              height="418"
-             layout="topleft"
-             left="0"
-             mouse_opaque="false"
+		             layout="topleft"
+		             left="0"
+		             mouse_opaque="false"
              name="folder_view"
              top_pad="0"
              width="313"
-             visible="false"/>
-            <panel
-             name="filtered_wearables_panel"
-             background_opaque="true"
-             background_visible="false"
-             layout="topleft"
-             follows="left|top|right|bottom"
-             border="false"
+		             visible="false"/>
+		            <panel
+		             name="filtered_wearables_panel"
+		             background_opaque="true"
+		             background_visible="false"
+		             layout="topleft"
+		             follows="left|top|right|bottom"
+		             border="false"
              height="418"
-             left="0"
-             mouse_opaque="false"
+		             left="0"
+		             mouse_opaque="false"
              width="310"
-             top_delta="0"
-             visible="true">
-                <wearable_items_list
-                 color="0.107 0.107 0.107 1"
+		             top_delta="0"
+		             visible="true">
+		             <wearable_items_list
+		              color="0.107 0.107 0.107 1"
                  name="list_view"
-                 allow_select="true"
-                 layout="topleft"
-                 follows="all"
-                 multi_select="true"
+		              allow_select="true"
+		              layout="topleft"
+		              follows="all"
+		              multi_select="true"
                  width="313"
                  height="418"
-                 left="0"
-                 top="0"/>
-            </panel>
+		              left="0"
+		              top="0"/>
+		            </panel>
             <button
 	         follows="bottom|left"
 	         height="22"
@@ -360,7 +363,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
 	         top_pad="5"
 	         width="130" />
 
-        </layout_panel>
+       </layout_panel>
     </layout_stack>
 
 
@@ -461,15 +464,15 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          name="list_view_btn"
          top="1"
          width="31" />
-        <icon
-         follows="bottom|left|right"
-         height="25"
+       <icon
+        follows="bottom|left|right"
+        height="25"
          image_name="Toolbar_Middle_Off"
-         layout="topleft"
-         left_pad="1"
+        layout="topleft"
+        left_pad="1"
          name="dummy_right_icon"
          width="186" >
-        </icon>
+       </icon>
         <button
          follows="bottom|right"
          height="25"
@@ -484,7 +487,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
          width="31" />
     </panel>
-    
+
     <!-- SAVE AND REVERT BUTTONS -->
     <panel
      follows="left|right|bottom"
@@ -514,30 +517,30 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                      user_resize="false" 
                      auto_resize="true"
                      width="156">
-                    <button
+        <button
                          follows="bottom|left|right"
-                         height="23"
-                         label="Save"
+         height="23"
+         label="Save"
                          left="1"
-                         layout="topleft"
-                         name="save_btn"
-                         top="0"
-                         width="155" />
-                    <button
+         layout="topleft"
+         name="save_btn"
+         top="0"
+         width="155" />
+        <button
                          follows="bottom|right"
-                         height="23"
-                         name="save_flyout_btn"
-                         label=""
-                         layout="topleft"
-                         left_pad="-20"
-                         tab_stop="false"
-                         top="0"
-                         image_selected="SegmentedBtn_Right_Selected_Press"
-                         image_unselected="SegmentedBtn_Right_Off"
-                         image_pressed="SegmentedBtn_Right_Press"
-                         image_pressed_selected="SegmentedBtn_Right_Selected_Press"
-                         image_overlay="Arrow_Small_Up"
-                         width="20"/>
+         height="23"
+         name="save_flyout_btn"
+         label=""
+         layout="topleft"
+         left_pad="-20"
+         tab_stop="false"
+         top="0"
+         image_selected="SegmentedBtn_Right_Selected_Press"
+         image_unselected="SegmentedBtn_Right_Off"
+         image_pressed="SegmentedBtn_Right_Press"
+         image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+         image_overlay="Arrow_Small_Up"
+         width="20"/>
 			    </layout_panel>
 			    <layout_panel
                      follows="bottom|left|right"
@@ -549,16 +552,16 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                      user_resize="false" 
                      auto_resize="true"
                      width="147">
-                    <button
-                         follows="bottom|left|right"
-                         height="23"
+        <button
+         follows="bottom|left|right"
+         height="23"
                          left="0"
-                         label="Undo Changes"
-                         layout="topleft"
-                         name="revert_btn"
-                         top="0"
-                         tool_tip="Revert to last saved version"
-                         width="147" />
+         label="Undo Changes"
+         layout="topleft"
+         name="revert_btn"
+         top="0"
+         tool_tip="Revert to last saved version"
+         width="147" />
 			    </layout_panel>
 			</layout_stack>
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index ab8930c967..e7a0b768c6 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -81,7 +81,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      width="317">
      	<panel
          background_opaque="true"
-         background_visible="true"
+       background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
          follows="all"
@@ -155,7 +155,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
         </panel>
         <panel
          background_opaque="true"
-         background_visible="true"
+       background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
          follows="all"
@@ -372,7 +372,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
         </panel>
         <panel
          background_opaque="true"
-         background_visible="true"
+       background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
          follows="all"
@@ -457,7 +457,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
         </panel>
         <panel
          background_opaque="true"
-         background_visible="true"
+       background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
          follows="all"
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 de147908d8..43d580844f 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
@@ -52,6 +52,7 @@
      layout="topleft"
      left="110"
      name="picture_name"
+     parse_urls="false"
      text_color="white"
      top="9"
      use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 01d1e48ba1..8036411d2b 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -315,7 +315,8 @@
              name="owner_value"
              top_delta="0"
              value="Alex Superduperlongenamenton"
-             width="205" />
+             use_ellipses="true" 
+             width="200" />
             <icon
              follows="top|left"
              height="16"
@@ -649,7 +650,8 @@
                          left_pad="0"
                          name="region_owner"
                          top_delta="0"
-                         value="moose Van Moose"
+                         value="moose Van Moose extra long name moose"
+                         use_ellipses="true" 
                          width="187" />
                         <text
                          follows="left|top"
@@ -710,7 +712,7 @@
                          name="estate_name_label"
                          top_pad="5"
                          value="Estate:"
-                         width="90" />
+                         width="80" />
                         <text
                          follows="left|top|right"
                          height="15"
@@ -727,7 +729,7 @@
                          name="estate_rating_label"
                          top_pad="5"
                          value="Rating:"
-                         width="90" />
+                         width="80" />
                         <text
                          follows="left|top|right"
                          height="15"
@@ -744,15 +746,17 @@
                          name="estate_owner_label"
                          top_pad="5"
                          value="Owner:"
-                         width="90" />
+                         width="80" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
                          left_pad="0"
                          name="estate_owner"
+                         value="Testing owner name length with long name" 
                          top_delta="0"
-                         width="187" />
+                         use_ellipses="true" 
+                         width="190" />
                         <text
                          follows="left|top"
                          height="15"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 31d8ea27d9..7d9bd1bf2a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -125,6 +125,7 @@ Automatic position for:
      left_pad="30"
      name="first_person_avatar_visible"
      width="256" />
+   
     <check_box
      control_name="ArrowKeysAlwaysMove"
      follows="left|top"
@@ -206,7 +207,7 @@ Automatic position for:
    left="80"
    name="UI Size:"
    top_pad="25"
-   width="160">
+   width="300">
     UI size
   </text>
   <slider
@@ -302,6 +303,7 @@ Automatic position for:
      halign="center"
      height="23"
      image_overlay="Refresh_Off"
+   layout="topleft" 
      tool_tip="Reset to Middle Mouse Button"
      mouse_opaque="true"
      name="set_voice_middlemouse_button"
@@ -315,7 +317,7 @@ Automatic position for:
  label="Other Devices"
  left="30"
  name="joystick_setup_button"
- top="27"
+ top_pad="27"
  width="155">
     <button.commit_callback
      function="Floater.Show"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 516457dd93..559df5bec9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -57,6 +57,8 @@
      left="10"
      multi_select="true"
      name="enabled_popups"
+     sort_column="0"
+     sort_ascending="true" 
      width="495" />
 	 <button
 	 enabled_control="FirstSelectedDisabledPopups"
@@ -103,6 +105,8 @@
      height="140"
      layout="topleft"
      left="10"
+     sort_column="0"
+     sort_ascending="true"
      multi_select="true"
      name="disabled_popups"
      width="495" />
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 17eebffa02..392d50fc42 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -106,7 +106,7 @@
      height="15"
      layout="topleft"
      left="30"
-     top_pad="15"
+     top_pad="14"
      name="maturity_desired_prompt"
      width="200">
         I want to access content rated:
@@ -216,7 +216,7 @@
     layout="topleft"
     left="30"
     name="name_tags_textbox"
-    top_pad="15"
+    top_pad="14"
     width="400">
        Name tags:
    </text>
@@ -225,25 +225,33 @@
      height="20"
      layout="topleft"
      left="50"
+     top_pad="5" 
      name="Name_Tag_Preference">
         <radio_item
          label="Off"
-         layout="topleft"
          name="radio"
+         top_delta="20" 
+         layout="topleft"
+         height="16" 
+         left="0" 
          value="0"
          width="75" />
         <radio_item
          label="On"
+         left_pad="0"
          layout="topleft"
-         left_pad="12"
+         top_delta="0" 
+         height="16" 
          name="radio2"
          value="1"
          width="75" />
         <radio_item
          label="Show briefly"
-         layout="topleft"
-         left_pad="12"
+         left_pad="0"
          name="radio3"
+         height="16"
+         layout="topleft"
+         top_delta="0"
          value="2"
          width="160" />
     </radio_group>
@@ -251,20 +259,45 @@
 	 enabled_control="AvatarNameTagMode"
      control_name="RenderNameShowSelf"
      height="16"
-     label="Show my name"
+     label="My name"
      layout="topleft"
-     left="50"
+     left="70"
      name="show_my_name_checkbox1"
-     width="300" />
+	 top_pad="0"
+     width="100" />
    <check_box
+     control_name="NameTagShowUsernames"
+	 enabled_control="AvatarNameTagMode"
+     height="16"
+     label="Usernames"
+     layout="topleft"
+     left_pad="70"
+     name="show_slids"
+     tool_tip="Show username, like bobsmith123"
+     top_delta="0" />
+    <check_box
+     control_name="NameTagShowGroupTitles"
 	 enabled_control="AvatarNameTagMode"
-     control_name="RenderShowGroupTitleAll"
      height="16"
-     label="Show group titles"
+     label="Group titles"
      layout="topleft"
-     left_delta="175"
+     left="70"
+     width="100" 
      name="show_all_title_checkbox1"
-     width="200" />
+	 tool_tip="Show group titles, like Officer or Member"
+     top_pad="5" />
+
+   <check_box
+    control_name="NameTagShowFriends"
+	 enabled_control="AvatarNameTagMode"
+     height="16"
+    label="Highlight friends"
+     layout="topleft"
+    left_pad="70"
+    name="show_friends"
+    tool_tip="Highlight the name tags of your friends"
+    top_delta="0" />
+
     <text
      type="string"
      length="1"
@@ -273,7 +306,7 @@
      layout="topleft"
      left="30"
      name="effects_color_textbox"
-     top_pad="15"
+     top_pad="9"
      width="200">
         My effects:
     </text>
@@ -285,6 +318,7 @@
       layout="topleft"
       left_pad="5"
       name="title_afk_text"
+      top_delta="0" 
       width="190">
     Away timeout:
     </text>
@@ -334,6 +368,17 @@
      name="item4"
      value="0" />
   </combo_box>
+  <check_box
+control_name="UseDisplayNames"
+follows="top|left"
+height="14"
+label="View Display Names"
+layout="topleft"
+left="30"
+name="display_names_check"
+width="237"
+tool_tip="Check to use display names in chat, IM, name tags, etc."
+top_pad="20"/>
     <text
      type="string"
      length="1"
@@ -343,7 +388,7 @@
      left="30"
      mouse_opaque="false"
      name="text_box3"
-     top_pad="15"
+     top_pad="10"
      width="240">
        Busy mode response:
     </text>
@@ -353,8 +398,8 @@
       bg_writeable_color="LtGray"
       use_ellipses="false"
      commit_on_focus_lost = "true"
-     follows="left|top|right"
-     height="60"
+     follows="left|top"
+     height="42"
      layout="topleft"
      left="50"
      name="busy_response"
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 113d5fb6dc..7d49a671e6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -155,7 +155,7 @@
 	 visiblity_control="ShowAdvancedGraphicsSettings"
      border="false"
 	 follows="top|left"
-     height="283"
+     height="300"
      label="CustomGraphics"
      layout="topleft"
      left="5"
@@ -291,7 +291,7 @@
       control_name="RenderReflectionDetail"
       height="23"
       layout="topleft"
-      left_="10"
+      left_delta="10"
       top_pad ="0"
       name="Reflections"
       width="150">
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 2c6ceeef2e..140d16e37f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -195,7 +195,6 @@
    control_name="CacheLocationTopFolder"
    border_style="line"
    border_thickness="1"
-   enabled="false"
    follows="left|top"
    font="SansSerif"
    height="23"
@@ -320,7 +319,19 @@
     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"/>
   <check_box
     top_delta="4"
     enabled="true"
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 6bf00373ea..b25fd695c9 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
@@ -33,10 +33,9 @@
 		mouse_opaque="false"
 		layout="topleft"
 		user_resize="false" />
-	<panel
+	<layout_panel
 		name="media_progress_indicator"
 		mouse_opaque="false"
-		follows="left|right|top"
 		height="8"
 		layout="topleft"
 		left="0"
@@ -55,7 +54,7 @@
 		  top="0"
 		  left="0"
 		  tool_tip="Media is Loading"/>
-	</panel>
+	</layout_panel>
 	<layout_panel
 		name="right_bookend_bottom"
 		width="0"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 78b192d4af..efc37c2127 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -263,7 +263,7 @@
              name="partner_data_panel"
              top_pad="0"
              width="300">
-              <name_box
+              <text
                follows="left|top"
                height="10"
                initial_value="(retrieving)"
@@ -272,8 +272,8 @@
                link="true"
                name="partner_text"
                top="0"
-           width="300"
-               word_wrap="true" />
+               use_ellipses="true"
+           width="300" />
             </panel>
             <text
              follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 3b4d6ae58d..97229c413c 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -8,85 +8,152 @@
  name="panel_target_profile"
  left="0"
  width="333">
-    <string
-     name="status_online">
-        Online
-    </string>
-    <string
-     name="status_offline">
-        Offline
-    </string>
-    <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
+  <string
+   name="status_online">
+    Online
+  </string>
+  <string
+   name="status_offline">
+    Offline
+  </string>
+  <button
+   follows="top|left"
+   height="24"
+   image_hover_unselected="BackButton_Over"
+   image_pressed="BackButton_Press"
+   image_unselected="BackButton_Off"
+   layout="topleft"
+   name="back"
+   left="10"
+   tab_stop="false"
+   top="2"
+   width="30" />
+  <text
+   top="10"
+   follows="top|left"
+   height="13"
+   layout="topleft"
+   left="45"
+   name="display_name_label"
+   text_color="LtGray"
+   value="Display Name:"
+   width="80" />
+  <text
+   top_delta="0"
+   follows="top|left"
+   height="13"
+   layout="topleft"
+   left="45"
+   name="solo_username_label"
+   text_color="LtGray"
+   value="Username:"
+   visible="false" 
+   width="80" />
+  <text
+   follows="top|right"
+   halign="right"
+   height="13"
+   layout="topleft"
+   right="-15"
+   name="status"
+   text_color="LtGray_50"
+   top_delta="0"
+   value="Online"
+   width="150" />
+  <text
+   follows="top|left|right"
+   font="SansSerifBigBold"
+   height="29"
+   layout="topleft"
+   left="45"
+   name="user_name_small"
+   text_color="LtGray"
+   top="22"
+   value="Jack oh look at me this is a super duper long name"
+   use_ellipses="true"
+   word_wrap="true"
+   visible="false"
+   width="255" />
+  <text
+   follows="top|left|right"
+   font="SansSerifHugeBold"
+   height="27"
+   layout="topleft"
+   left="45"
+   name="user_name"
+   text_color="LtGray"
+   top="25"
+   value="Jack Linden"
+   visible="true"
+   use_ellipses="true"
+   width="258" /> 
+  <button
+         name="copy_to_clipboard"
+         layout="topleft"
+         follows="top|right"
+         image_overlay="Copy"
+         top_delta="0"
+         right="-15"
+         height="21"
+         width="21"
+         tab_stop="false" 
+         tool_tip="Copy to Clipboard"/>
+  <text
+   follows="top|left"
+   height="13"
+   layout="topleft"
+   left="45"
+   name="user_label"
+   text_color="LtGray"
+   top_pad="10" 
+   value="Username:"
+   width="70" />
+  <text
+   follows="top|left"
+   height="20"
+   layout="topleft"
+   left_pad="0"
+   name="user_slid"
+   text_color="EmphasisColor"
+   font="SansSerifBold"
+   top_delta="-2"
+   use_ellipses="true"
+   value="jack.linden"
+   width="195" 
+   wrap="true "/>
+  <tab_container
+   follows="all"
+   height="489"
+   halign="center"
+   layout="topleft"
+   left="5"
+   min_width="333"
+   name="tabs"
+   tab_min_width="80"
+   tab_height="30"
+   tab_position="top"
+   top_pad="5"
+   width="317">
+    <panel
+     class="panel_profile"
+     filename="panel_profile.xml"
+     label="PROFILE"
      layout="topleft"
-     name="back"
-     left="10"
-     tab_stop="false"
-     top="2"
-     width="30" />
-    <text_editor
-    	h_pad="0"
-    	v_pad="0"
-      allow_scroll="false"
-      bg_visible="false"
-      read_only = "true"
-      follows="top|left|right"
-      font="SansSerifHugeBold"
-      height="26"
-      layout="topleft"
-      left_pad="5"
-      name="user_name"
-      text_color="LtGray"
-      top="2"
-      value="(Loading...)"
-      use_ellipses="true"
-      width="275" />
-    <text
-     follows="top|left"
-     height="13"
+     help_topic="profile_profile_tab"
+     name="panel_profile" />
+    <panel
+     class="panel_picks"
+     filename="panel_picks.xml"
+     label="PICKS"
      layout="topleft"
-     left="45"
-     name="status"
-     text_color="LtGray_50"
-     value="Online"
-     width="150" />
-    <tab_container
-     follows="all"
-     height="515"
-     halign="center"
+     help_topic="profile_picks_tab"
+     name="panel_picks" />
+    <panel
+     class="panel_notes"
+     filename="panel_notes.xml"
+     label="NOTES &amp; PRIVACY"
      layout="topleft"
-     left="5"
-     min_width="333"
-     name="tabs"
-     tab_min_width="80"
-     tab_height="30"
-     tab_position="top"
-     top_pad="5"
-     width="317">
-        <panel
-         class="panel_profile"
-         filename="panel_profile.xml"
-         label="PROFILE"
-         layout="topleft"
-         help_topic="profile_profile_tab"
-         name="panel_profile" />
-        <panel
-         class="panel_picks"
-         filename="panel_picks.xml"
-         label="PICKS"
-         layout="topleft"
-         help_topic="profile_picks_tab"
-         name="panel_picks" />
-        <panel
-         class="panel_notes"
-         filename="panel_notes.xml"
-         label="NOTES &amp; PRIVACY"
-         layout="topleft"
-         help_topic="profile_notes_tab"
-         name="panel_notes" />
-    </tab_container>
+     help_topic="profile_notes_tab"
+     name="panel_notes" />
+  </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 727c5fb7b2..2868d91cc7 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -34,6 +34,7 @@
              height="768"
              layout="topleft"
              left="0"
+             orientation="vertical" 
              name="stack2"
              top="0"
              width="640">
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index a6b4ddd01e..15df095efa 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -103,7 +103,7 @@
      mouse_opaque="false"
      name="target_avatar_name"
      top_delta="-2"
-     width="180">
+     width="270">
         (none)
     </line_editor>
     <button
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 08e36d5e57..1307d807e2 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -72,7 +72,8 @@
      left_delta="0"
      name="estate_owner"
      top_delta="16"
-     width="150">
+     use_ellipses="true"
+     width="290">
         (unknown)
     </text>
     <view_border
diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
deleted file mode 100644
index ffa1a257d5..0000000000
--- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="top|left"
- height="360"
- label="Region"
- layout="topleft"
- left="0"
- name="General"
- top="360"
- width="280">
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="region_text_lbl"
-     top="10"
-     width="100">
-        Region:
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="50"
-     name="region_text"
-     top_delta="0"
-     width="200">
-        unknown
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="version_channel_text_lbl"
-     top="30"
-     width="100">
-        Version:
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="50"
-     name="version_channel_text"
-     top_delta="0"
-     width="200">
-        unknown
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="region_type_lbl"
-     top="50"
-     width="100">
-        Type:
-    </text>
-    <text
-     follows="left|top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left_delta="50"
-     name="region_type"
-     top_delta="0"
-     width="200">
-        unknown
-    </text>
-    <check_box
-     height="20"
-     label="Block Terraform"
-     layout="topleft"
-     left="10"
-     name="block_terraform_check"
-     top="70"
-     width="80" />
-    <check_box
-     height="20"
-     label="Block Fly"
-     layout="topleft"
-     left="10"
-     name="block_fly_check"
-     top="90"
-     width="80" />
-    <check_box
-     height="20"
-     label="Allow Damage"
-     layout="topleft"
-     left="10"
-     name="allow_damage_check"
-     top="110"
-     width="80" />
-    <check_box
-     height="20"
-     label="Restrict Pushing"
-     layout="topleft"
-     left="10"
-     name="restrict_pushobject"
-     top="130"
-     width="80" />
-    <check_box
-     height="20"
-     label="Allow Land Resell"
-     layout="topleft"
-     left="10"
-     name="allow_land_resell_check"
-     top="160"
-     width="80" />
-    <check_box
-     height="20"
-     label="Allow Land Join/Divide"
-     layout="topleft"
-     left="10"
-     name="allow_parcel_changes_check"
-     top="180"
-     width="80" />
-    <check_box
-     height="20"
-     label="Block Land Show in Search"
-     layout="topleft"
-     left="10"
-     name="block_parcel_search_check"
-     tool_tip="Let people see this region and its parcels in search results"
-     top="200"
-     width="80" />
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="1"
-     label="Agent Limit"
-     label_width="97"
-     layout="topleft"
-     left="10"
-     max_val="100"
-     min_val="1"
-     name="agent_limit_spin"
-     top="240"
-     width="170" />
-    <spinner
-     follows="left|top"
-     height="20"
-     increment="0.5"
-     label="Object Bonus"
-     label_width="97"
-     layout="topleft"
-     left="10"
-     max_val="10"
-     min_val="1"
-     name="object_bonus_spin"
-     top="260"
-     width="170" />
-    <text
-     follows="left|top"
-     height="20"
-     label="Maturity"
-     layout="topleft"
-     left="10"
-     name="access_text"
-     top="290"
-     width="100">
-        Rating:
-    </text>
-    <combo_box
-     height="20"
-     label="Moderate"
-     layout="topleft"
-     left_delta="100"
-     name="access_combo"
-     top_delta="0"
-     width="85">
-        <combo_box.item
-         label="Adult"
-         name="Adult"
-         value="42" />
-        <combo_box.item
-         label="Moderate"
-         name="Mature"
-         value="21" />
-        <combo_box.item
-         label="General"
-         name="PG"
-         value="13" />
-    </combo_box> 
-    <button
-     enabled="false"
-     follows="left|top"
-     height="20"
-     label="Apply"
-     layout="topleft"
-     left="108"
-     name="apply_btn"
-     top="320"
-     width="100"/>
-   <button
-     follows="left|top"
-     height="20"
-     label="Teleport Home One Resident..."
-     layout="topleft"
-     left="10"
-     name="kick_btn"
-     top_pad="10"
-     width="250" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Teleport Home All Residents..."
-     layout="topleft"
-     left_delta="0"
-     name="kick_all_btn"
-     top_pad="3"
-     width="250" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Send Message To Region..."
-     layout="topleft"
-     left_delta="0"
-     name="im_btn"
-     top_pad="20"
-     width="200" />
-    <button
-     follows="left|top"
-     height="20"
-     label="Manage Telehub..."
-     layout="topleft"
-     left_delta="0"
-     name="manage_telehub_btn"
-     top_pad="20"
-     width="150" >
-		<button.commit_callback
-         function="RegionInfo.ManageTelehub" />
-    </button> 
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
index 9dff00fa0b..c5e8bf5803 100644
--- a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
@@ -79,6 +79,8 @@
      layout="topleft"
      left_delta="0"
      multi_select="true"
+     sort_column="0"
+     sort_ascending="true"
      name="scripts_list"
      top_delta="16"
      width="460">
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index ab3cc036d5..72b2f5e84f 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -17,15 +17,18 @@
    left="10"
    name="stack"
    top_pad="10"
+   orientation="vertical" 
    width="313">
     <layout_panel
      height="550"
      layout="topleft"
      left_delta="0"
      name="browser_layout"
+     orientation="vertical" 
      top_delta="0"
      width="313">
       <web_browser
+        trusted_content="true"
        border_visible="false"
        follows="all"
        height="550"
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index a6036f8b78..89aef57cca 100644
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -108,6 +108,9 @@
 		<action description="Allow &apos;Set Home to Here&apos; on group land"
 		     longdescription="Members in a Role with this Ability can use World menu &gt; Landmarks &gt; Set Home to Here on a parcel deeded to this group."
 		     name="land allow set home" value="28" />
+		<action description="Allow &apos;Event Hosting&apos; on group land"
+		     longdescription="Members in a Role with this Ability can select group owned parcels as venus when hosting an event."
+		     name="land allow host event" value="41" />			 
 	</action_set>
 	<action_set
 	     description="These Abilities include powers to allow or restrict access to group-owned parcels, including freezing and ejecting Residents."
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index c1c0f07304..b5839878d5 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -77,6 +77,7 @@ width="333">
       font="SansSerifLargeBold"
       height="20"
       left="35"
+      parse_urls="false"
       text_color="White"
       top="15"
       use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 182bc29e27..8760c911dc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -174,8 +174,9 @@
          layout="topleft"
          left_pad="5"
                  name="LabelCreatorName"
-                 top_delta="6"
-                 width="140">
+       top_delta="6"
+       use_ellipses="true"
+       width="165">
           </text>
           <button
           follows="top|right"
@@ -217,7 +218,8 @@
             left_pad="5"
           name="LabelOwnerName"
           top_delta="6"
-          width="140">
+       use_ellipses="true"
+			 width="165">
           </text>
              <button
                  follows="top|right"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 843015cb8b..a2f7edb167 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -167,7 +167,8 @@
      left_pad="0"
              name="Creator Name"
 		     top_delta="0"
-		     width="140">
+         use_ellipses="true" 
+		     width="225">
 	        Erica Linden
 	     </text>
 	    <text
@@ -191,7 +192,8 @@
 			    left_pad="0"
 			    name="Owner Name"
 			    top_delta="0"
-			    width="140">
+          use_ellipses="true" 
+			    width="225">
 			    Erica Linden
 	     </text>
 	    	    <text
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 6b3fd9ff9e..7f48d60ab2 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -89,6 +89,7 @@
 	<string name="TooltipHttpUrl">Click to view this web page</string>
 	<string name="TooltipSLURL">Click to view this location's information</string>
 	<string name="TooltipAgentUrl">Click to view this Resident's profile</string>
+  <string name="TooltipAgentInspect">Learn more about this Resident</string>
 	<string name="TooltipAgentMute">Click to mute this Resident</string>
 	<string name="TooltipAgentUnmute">Click to unmute this Resident</string>
 	<string name="TooltipAgentIM">Click to IM this Resident</string>
@@ -321,6 +322,8 @@
 
 	<!-- For land type back from the simulator -->
 	<string name="Estate / Full Region">Estate / Full Region</string>
+	<string name="Estate / Homestead">Estate / Homestead</string>
+	<string name="Mainland / Homestead">Mainland / Homestead</string>
 	<string name="Mainland / Full Region">Mainland / Full Region</string>
 
 	<!-- File load/save dialogs -->
@@ -1790,6 +1793,43 @@ Returns the media params for a particular face on an object, given the desired l
 llClearPrimMedia(integer face)
 Clears (deletes) the media and all params from the given face.
   </string>
+<string name="LSLTipText_llSetLinkPrimitiveParamsFast" translate="false">
+llSetLinkPrimitiveParamsFast(integer linknumber,list rules)
+Set primitive parameters for linknumber based on rules.
+</string>
+<string name="LSLTipText_llGetLinkPrimitiveParams" translate="false">
+llGetLinkPrimitiveParams(integer linknumber,list rules)
+Get primitive parameters for linknumber based on rules.
+</string>
+<string name="LSLTipText_llLinkParticleSystem" translate="false">
+llLinkParticleSystem(integer linknumber,list rules)
+Creates a particle system based on rules.  Empty list removes particle system from object.
+List format is [ rule1, data1, rule2, data2 . . . rulen, datan ].
+</string>
+<string name="LSLTipText_llSetLinkTextureAnim" translate="false">
+llSetLinkTextureAnim(integer link, integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
+Animate the texture on the specified prim's face/faces.
+</string>
+<string name="LSLTipText_llGetLinkNumberOfSides" translate="false">
+integer llGetLinkNumberOfSides(integer link)
+Returns the number of sides of the specified linked prim.
+</string>
+<string name="LSLTipText_llGetUsername" translate="false">
+string llGetUsername(key id)
+Returns the single-word username of an avatar, iff the avatar is in the current region, otherwise the empty string.
+</string>
+<string name="LSLTipText_llRequestUsername" translate="false">
+key llRequestUsername(key id)
+Requests single-word username of an avatar.  When data is available the dataserver event will be raised.
+</string>
+<string name="LSLTipText_llGetDisplayName" translate="false">
+string llGetDisplayName(key id)
+Returns the name of an avatar, iff the avatar is in the current simulator, otherwise the empty string.
+</string>
+<string name="LSLTipText_llRequestDisplayName" translate="false">
+key llRequestDisplayName(key id)
+Requests name of an avatar.  When data is available the dataserver event will be raised.
+</string>
 
   <!-- Avatar busy/away mode -->
 	<string name="AvatarSetNotAway">Not Away</string>
@@ -3046,7 +3086,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
     You are the only user in this session.
   </string>
   <string name="offline_message">
-    [FIRST] [LAST] is offline.
+    [NAME] is offline.
   </string>
   <string name="invite_message">
     Click the [BUTTON NAME] button to accept/connect to this voice chat.
@@ -3132,17 +3172,20 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="voice_morphing_url">http://secondlife.com/landing/voicemorphing</string>
 
   <!-- Financial operations strings -->
-  <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string>
+  <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT] [REASON].</string>
+  <string name="paid_you_ldollars_no_reason">[NAME] paid you L$[AMOUNT].</string>
   <string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string>
   <string name="you_paid_ldollars_no_info">You paid L$[AMOUNT].</string>
   <string name="you_paid_ldollars_no_reason">You paid [NAME] L$[AMOUNT].</string>
   <string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string>
+  <string name="for item">for [ITEM]</string>
   <string name="for a parcel of land">for a parcel of land</string>
   <string name="for a land access pass">for a land access pass</string>
   <string name="for deeding land">for deeding land</string>
   <string name="to create a group">to create a group</string>
   <string name="to join a group">to join a group</string>
   <string name="to upload">to upload</string>
+  <string name="to publish a classified ad">to publish a classified ad</string>
   
   <string name="giving">Giving L$ [AMOUNT]</string>
   <string name="uploading_costs">Uploading costs L$ [AMOUNT]</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index ef885e8045..c0a948931c 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -19,6 +19,7 @@
   font="SansSerif">
   <more_chat_text
     mouse_opaque="true" 
+    parse_urls="false"
     word_wrap="true"
     />
 </chat_history>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml
index 726ae803fe..7a60bee338 100644
--- a/indra/newview/skins/default/xui/en/widgets/check_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<check_box text_enabled_color="LabelTextColor"
-           text_disabled_color="LabelDisabledColor"
-           font="SansSerifSmall"
+<check_box font="SansSerifSmall"
            follows="left|top">
-  <check_box.label_text name="checkbox label" />
+  <check_box.label_text name="checkbox label"
+                        text_color="LabelTextColor"
+                        text_readonly_color="LabelDisabledColor"/>
   <check_box.check_button name="CheckboxCtrl Button"
                           commit_on_return="false"
                           label=""
diff --git a/indra/newview/skins/default/xui/en/widgets/hint_popup.xml b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml
new file mode 100644
index 0000000000..92080df154
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<hint_popup
+ name="hint"
+ background_opaque="true"
+ background_visible="true"
+ chrome="true" 
+ layout="topleft"
+ bg_opaque_image="hint_background"
+ distance="24"
+ left_arrow="hint_arrow_left"
+ up_arrow="hint_arrow_up" 
+ right_arrow="hint_arrow_right"
+ down_arrow="hint_arrow_down"
+ lower_left_arrow="hint_arrow_lower_left"
+ left_arrow_offset="3"
+ up_arrow_offset="-2"
+ right_arrow_offset="-3"
+ down_arrow_offset="5"
+ fade_in_time="0.2"
+ fade_out_time="0.3">
+</hint_popup>
diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml
index 428b2ce03b..8c171c387f 100644
--- a/indra/newview/skins/default/xui/en/widgets/inspector.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <inspector name="inspector"
+           max_width="300"
            bg_opaque_color="DkGray_66"
            background_visible="true"
            bg_opaque_image="Inspector_Hover"
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
index 48bc021e6d..830ea12e41 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
@@ -8,18 +8,18 @@
             thickness="15">
   <up_button image_unselected="ScrollArrow_Up"
              image_selected="ScrollArrow_Up"
-             scale_image="true" thickness="15"
+             scale_image="true"
              hover_glow_amount="0.35"/>
   <down_button image_unselected="ScrollArrow_Down"
                image_selected="ScrollArrow_Down"
-               scale_image="true" thickness="15"
+               scale_image="true"
                hover_glow_amount="0.35"/>
   <left_button image_unselected="ScrollArrow_Left"
                image_selected="ScrollArrow_Left"
-               scale_image="true" thickness="15"
+               scale_image="true"
                hover_glow_amount="0.35"/>
   <right_button image_unselected="ScrollArrow_Right"
                image_selected="ScrollArrow_Right"
-               scale_image="true" thickness="15"
+               scale_image="true"
                hover_glow_amount="0.35"/>
 </scroll_bar>
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
index 3878c7a144..a120b1aec8 100644
--- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
@@ -23,7 +23,4 @@
   bg_writeable_color="TextBgWriteableColor"
   bg_selected_color="EmphasisColor"
   bg_focus_color="TextBgFocusColor">
-  <simple_text_editor.border
-    bevel_style="in"
-    follows="all" />
 </simple_text_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
index 180120ec89..0f7f50b312 100644
--- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
@@ -2,5 +2,4 @@
 <!-- Core parameters are in simple_text_editor.xml -->
 <text_editor
   parse_urls="false"
-  text_readonly_color="LabelDisabledColor"
   show_context_menu="true"/>