Local merge

38 files changed, 781 insertions, 354 deletions

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 58ea7cec9c..2b0cb66f61 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -9,6 +9,18 @@
  title="ABOUT LAND"
  width="490">
     <floater.string
+      name="maturity_icon_general">
+      "Parcel_PG_Dark"
+    </floater.string>
+    <floater.string
+      name="maturity_icon_moderate">
+      "Parcel_M_Dark"
+    </floater.string>
+    <floater.string
+      name="maturity_icon_adult">
+      "Parcel_R_Dark"
+    </floater.string>
+    <floater.string
      name="Minutes">
         [MINUTES] minutes
     </floater.string>
@@ -46,7 +58,7 @@
          top="0">
             <panel.string
              name="new users only">
-                New users only
+                New Residents only
             </panel.string>
             <panel.string
              name="anyone">
@@ -395,7 +407,7 @@ Leyla Linden               </text>
              name="Cancel Land Sale"
              left_pad="5"
              top_pad="-25"
-             width="145" />
+             width="155" />
             <text
              type="string"
              length="1"
@@ -1504,7 +1516,7 @@ Only large parcels can be listed in search.
              name="Clear"
              tool_tip="Clear the landing point"
              right="-10"
-             width="50" />
+             width="55" />
             <text
              type="string"
              length="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 98508e5113..125b080519 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -64,7 +64,7 @@ Try selecting a smaller area.
     </floater.string>
     <floater.string
      name="not_owned_by_you">
-        Land owned by another user is selected. 
+        Land owned by another Resident is selected. 
 Try selecting a smaller area.
     </floater.string>
     <floater.string
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index b048eeceb6..6f2b0fc3ea 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -286,7 +286,7 @@
              height="23"
              layout="topleft"
              name="Item Action Label"
-             right="132"
+             right="90"
              width="100">
                 Shape:
             </text>
@@ -307,7 +307,7 @@
              label_selected="Save"
              layout="topleft"
              name="Save"
-             right="218"
+             right="186"
              top="477"
              width="82" />
             <button
@@ -319,7 +319,7 @@
              name="Save As"
              top="477"
              right="304"
-             width="82" />
+             width="115" />
         </panel>
         <panel
          border="false"
@@ -489,7 +489,7 @@
              height="23"
              layout="topleft"
              name="Item Action Label"
-             right="132"
+             right="90"
              width="100">
                 Skin:
             </text>
@@ -548,7 +548,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -561,7 +561,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -739,7 +739,7 @@
              height="23"
              layout="topleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Hair:
             </text>
@@ -771,7 +771,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -784,7 +784,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -924,7 +924,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Eyes:
             </text>
@@ -955,7 +955,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -968,7 +968,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1069,7 +1069,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -1082,7 +1082,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1193,7 +1193,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Shirt:
             </text>
@@ -1272,7 +1272,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -1285,7 +1285,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1396,7 +1396,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Pants:
             </text>
@@ -1538,7 +1538,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Shoes:
             </text>
@@ -1579,7 +1579,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -1592,7 +1592,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1741,7 +1741,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Socks:
             </text>
@@ -1782,7 +1782,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -1795,7 +1795,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -1944,7 +1944,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Jacket:
             </text>
@@ -1996,7 +1996,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2009,7 +2009,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2158,7 +2158,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Gloves:
             </text>
@@ -2199,7 +2199,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2212,7 +2212,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2361,7 +2361,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Undershirt:
             </text>
@@ -2402,7 +2402,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2415,7 +2415,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2564,7 +2564,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Underpants:
             </text>
@@ -2605,7 +2605,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2618,7 +2618,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2767,7 +2767,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Skirt:
             </text>
@@ -2808,7 +2808,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -2821,7 +2821,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -2970,7 +2970,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Tattoo:
             </text>
@@ -3024,7 +3024,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -3037,7 +3037,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
@@ -3186,7 +3186,7 @@
              height="23"
              layout="bottomleft"
              name="Item Action Label"
-             right="132"
+             right="90" 
              width="100">
                 Alpha:
             </text>
@@ -3305,7 +3305,7 @@
              label="Save"
              label_selected="Save"
              layout="topleft"
-             right="218"
+             right="186"
              name="Save"
              top="477"
              width="82" />
@@ -3318,7 +3318,7 @@
              right="304"
              name="Save As"
              top="477"
-             width="82" />
+             width="115" />
             <button
              follows="right|bottom"
              height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
index 0fac6cd5f1..36ef6beb59 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -31,8 +31,8 @@
             <button
              follows="left|top"
              height="20"
-             label="Kick all users"
-             label_selected="Kick all users"
+             label="Kick all Residents"
+             label_selected="Kick all Residents"
              layout="topleft"
              left="10"
              name="Kick all users"
diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml
index a21242ffe1..55efe83820 100644
--- a/indra/newview/skins/default/xui/en/floater_im.xml
+++ b/indra/newview/skins/default/xui/en/floater_im.xml
@@ -14,7 +14,7 @@
  width="419">
     <multi_floater.string
      name="only_user_message">
-        You are the only user in this session.
+        You are the only Resident in this session.
     </multi_floater.string>
     <multi_floater.string
      name="offline_message">
@@ -54,7 +54,7 @@
     </multi_floater.string>
     <multi_floater.string
      name="add_session_event">
-        Unable to add users to chat session with [RECIPIENT].
+        Unable to add Residents to chat session with [RECIPIENT].
     </multi_floater.string>
     <multi_floater.string
      name="message_session_event">
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 0f098bbb52..65a05f3ec5 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -22,7 +22,9 @@
      tab_width="64"
      tab_max_width = "134"
      tab_height="16"
-     halign="center"
+     use_custom_icon_ctrl="true"
+     tab_icon_ctrl_pad="2"
+     halign="left"
      use_ellipses="true"
      top="0"
      width="390" />
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 d2e5473157..25016e0673 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -2,6 +2,7 @@
 <floater
  legacy_header_height="18"
  background_visible="true"
+ default_tab_group="1"
  follows="all"
  height="350"
  layout="topleft"
@@ -18,12 +19,14 @@
  min_height="190">
   <layout_stack
    animate="false" 
+   default_tab_group="2"
   follows="all"
   height="320"
   width="360"
   layout="topleft"
   orientation="horizontal"
   name="im_panels"
+  tab_group="1"
   top="20"
   left="0">
     <layout_panel
@@ -35,7 +38,9 @@
       auto_resize="false"
       user_resize="true" />
     <layout_panel
+       default_tab_group="3"
        left="0"
+       tab_group="2"
        top="0"
        height="200"
 	     width="245"
@@ -75,6 +80,7 @@
          label="To"
          layout="bottomleft"
          name="chat_editor"
+         tab_group="3"
          width="240">
         </line_editor>
     </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
index 3f7642fafe..bea35e5fc1 100644
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@@ -16,7 +16,7 @@
         [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
     </floater.string>
     <scroll_list
-     bottom="270"
+     bottom="268"
      column_padding="0"
      draw_heading="true"
      follows="top|right|left|bottom"
@@ -47,23 +47,23 @@
     </scroll_list>
     <button
      follows="left|bottom"
-     height="20"
+     height="23"
      label="See Owner Profile..."
      layout="topleft"
-     left_delta="0"
+     left_delta="-1"
      name="button owner"
      tool_tip="See profile of the highlighted object&apos;s owner"
-     top_pad="5"
+     top_pad="4"
      width="150">
 		<button.commit_callback
 		function="Inspect.OwnerProfile" />
 	</button>
     <button
      follows="left|bottom"
-     height="20"
+     height="23"
      label="See Creator Profile..."
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="button creator"
      tool_tip="See profile of the highlighted object&apos;s original creator"
      top_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index 990be55847..1f192f9b28 100644
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
@@ -45,9 +45,9 @@
      layout="topleft"
      name="Reset"
      left="10"
-     width="61" />
+     width="85" />
     <check_box
-    left_delta="71"
+    left_delta="90"
     top_delta="3"
      enabled="false"
      follows="left|bottom"
@@ -57,9 +57,9 @@
      label="Running"
      layout="topleft"
      name="running"
-     width="100" />
+     width="205" />
     <check_box
-    left_delta="75"
+    left_delta="140"
      enabled="true"
      follows="left|bottom"
      font="SansSerif"
diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
new file mode 100644
index 0000000000..3225843d09
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="200"
+ layout="topleft"
+ name="publish_classified"
+ help_topic="price_for_listing"
+ title="Publishing Classified"
+ width="320">
+    <text
+     top="20"
+     follows="top|left"
+     font="SansSerif"
+     height="60"
+     layout="topleft"
+     left="15"
+     word_wrap="true"
+     name="explanation_text">
+     
+Your classified ad will run for one week from the date it is published.
+        
+Remember, Classified fees are non-refundable.
+
+    </text>
+    <spinner
+     decimal_digits="0"
+     follows="left|top"
+     halign="left"
+     height="23"
+     increment="1"
+     label_width="70"
+     label="Price for Ad: "
+     v_pad="10"
+     layout="topleft"
+     left="15"
+     value="50"
+     min_val="50"
+     max_val="99999"
+     name="price_for_listing"
+     top_pad="10"
+     tool_tip="Price for listing."
+     width="150" />
+    <text
+     follows="top|left"
+     font="SansSerif"
+     height="60"
+     layout="topleft"
+     left_pad="5"
+     top_delta="0"
+     word_wrap="true"
+     value="L$"
+     name="l$_text" />
+    <text
+     follows="top|right"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="15"
+     name="more_info_text"
+     top_pad="-20"
+     width="300">
+More info (link to classified help)
+    </text>
+    <button
+     follows="top|left"
+     height="22"
+     label="Publish"
+     layout="topleft"
+     left="105"
+     name="publish_btn"
+     top="160"
+     width="100" />
+    <button
+     follows="top|left"
+     height="22"
+     label="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="cancel_btn"
+     width="100" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 1ab3dda52c..dda14f02ff 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -45,7 +45,7 @@
     </radio_group>
   <ui_ctrl 
     height="90"
-    width="90"
+    width="125"
     layout="topleft"
     name="thumbnail_placeholder"
     top_pad="6"
@@ -105,9 +105,11 @@
      width="100">
         <flyout_button.item
          label="Save"
+         name="save_item"
          value="save" />
         <flyout_button.item
          label="Save As..."
+         name="saveas_item"
          value="save as" />
     </flyout_button>
         <button
@@ -147,7 +149,7 @@
      left="10"
      name="type_label2"
      top_pad="5"
-     width="120">
+     width="127">
         Size
     </text>
     <text
@@ -197,7 +199,7 @@
      left_delta="0"
      name="texture_size_combo"
      top_delta="0"
-     width="120">
+     width="127">
         <combo_box.item
          label="Current Window"
          name="CurrentWindow"
@@ -226,7 +228,7 @@
      left_delta="0"
      name="local_size_combo"
      top_delta="0"
-     width="120">
+     width="127">
         <combo_box.item
          label="Current Window"
          name="CurrentWindow"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 4e59a9b1ca..affe74d148 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -581,7 +581,7 @@
          left="0"
          name="radio select land"
          top="-1"
-         width="114" />
+         width="134" />
         <radio_item
          height="19"
          label="Flatten"
@@ -639,7 +639,7 @@
      follows="left|top"
      height="12"
      layout="topleft"
-     left="125"
+     left="150"
      name="Bulldozer:"
      top="57"
      width="100">
@@ -2816,7 +2816,7 @@ even though the user gets a free copy.
          left="20"
          name="label_parcel_info"
          top="24"
-         width="150">
+         width="240">
             Parcel Information
         </text>
         <text
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 86ac7c8e54..291f8f6f51 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -53,7 +53,8 @@
  follows="right|top"
   height="126"
   top_pad="0"
-  width="238">
+  width="238"
+  name="layout_panel_2">
 <button
      follows="right|top"
      height="22"
@@ -374,7 +375,8 @@
   top_pad="0"
   width="238"
   background_visible="true"
-  bg_alpha_color="DkGray2">
+  bg_alpha_color="DkGray2"
+  name="layout_panel_3">
     <text
      text_color="White"
      font="SansSerifLarge"
@@ -396,7 +398,8 @@
      follows="right|top|bottom"
 	 height="310"
 	 top_pad="0"
-	 width="238">
+	 width="238"
+	 name="layout_panel_4">
 	 <icon
       color="0.5 0 0 1"
       follows="top|right"
@@ -638,7 +641,8 @@
   top_pad="0"
   width="238"
   background_visible="true"
-  bg_alpha_color="DkGray2">
+  bg_alpha_color="DkGray2"
+  name="layout_panel_5">
     <text
      text_color="White"
      font="SansSerifLarge"
@@ -660,7 +664,8 @@
   height="30"
   min_height="30"
   top_pad="0"
-  width="238">
+  width="238"
+  name="layout_panel_6">
   <icon
      follows="left|bottom"
      height="16"
@@ -670,7 +675,7 @@
      mouse_opaque="true"
      name="zoom_icon"
      top_pad="7"
-     width="16" />
+     width="16" ></icon>
     <slider
      follows="left|bottom"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 7b6081d7be..85853f39bb 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -156,18 +156,19 @@
                    name="notify_container"
                    tab_group="-2"
                    width="1024"/>
-  <menu_holder top="0"
-               follows="all"
-               height="768"
-               mouse_opaque="false"
-               name="Menu Holder"
-               width="1024"/>
   <panel top="0"
          follows="all"
          height="768"
          mouse_opaque="false"
          name="popup_holder"
+         class="popup_holder"
          width="1024"/>
+  <menu_holder top="0"
+               follows="all"
+               height="768"
+               mouse_opaque="false"
+               name="Menu Holder"
+               width="1024"/>
   <snapshot_floater_view enabled="false"
                          follows="all"
                          height="768"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 936f4a3fab..a2540237c8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -249,7 +249,7 @@ Save all changes to clothing/body parts?
     Non-friends won't know that you've choosen to ignore their calls and instant messages.
     <usetemplate
      name="okbutton"
-     yestext="Yes"/>
+     yestext="OK"/>
   </notification>
 
   <notification
@@ -2848,11 +2848,11 @@ Leave Group?
    icon="alert.tga"
    name="ConfirmKick"
    type="alert">
-Do you REALLY want to kick all users off the grid?
+Do you REALLY want to kick all Residents off the grid?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
-     yestext="Kick All Users"/>
+     yestext="Kick All Residents"/>
   </notification>
 
   <notification
@@ -2952,7 +2952,7 @@ You have reached your maximum number of groups. Please leave some group before j
    icon="alert.tga"
    name="KickUser"
    type="alert">
-Kick this user with what message?
+Kick this Resident with what message?
     <form name="form">
       <input name="message" type="text">
 An administrator has logged you off.
@@ -2994,7 +2994,7 @@ An administrator has logged you off.
    icon="alert.tga"
    name="FreezeUser"
    type="alert">
-Freeze this user with what message?
+Freeze this Resident with what message?
     <form name="form">
       <input name="message" type="text">
 You have been frozen. You cannot move or chat. An administrator will contact you via instant message (IM).
@@ -3015,7 +3015,7 @@ You have been frozen. You cannot move or chat. An administrator will contact you
    icon="alert.tga"
    name="UnFreezeUser"
    type="alert">
-Unfreeze this user with what message?
+Unfreeze this Resident with what message?
     <form name="form">
       <input name="message" type="text">
 You are no longer frozen.
@@ -3057,7 +3057,7 @@ Join me in [REGION]
    icon="alertmodal.tga"
    name="OfferTeleportFromGod"
    type="alertmodal">
-God summon user to your location?
+God summon Resident to your location?
     <form name="form">
       <input name="message" type="text">
 Join me in [REGION]
@@ -3137,7 +3137,7 @@ Type a short announcement which will be sent to everyone currently in your estat
    type="alert">
 You are about to change a Linden owned estate (mainland, teen grid, orientation, etc.).
 
-This is EXTREMELY DANGEROUS because it can fundamentally affect the user experience.  On the mainland, it will change thousands of regions and make the spaceserver hiccup.
+This is EXTREMELY DANGEROUS because it can fundamentally affect the Resident experience.  On the mainland, it will change thousands of regions and make the spaceserver hiccup.
 
 Proceed?
     <usetemplate
@@ -5383,7 +5383,7 @@ Grant this request?
    icon="notify.tga"
    name="ScriptToast"
    type="notify">
-    [FIRST] [LAST]&apos;s &apos;[TITLE]&apos; is requesting user input.
+    [FIRST] [LAST]&apos;s &apos;[TITLE]&apos; is requesting Resident input.
     <form name="form">
       <button
        index="0"
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 34c1923582..e3b331799c 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -22,6 +22,22 @@
   name="l$_price">
     L$[PRICE]
  </panel.string>
+ <panel.string
+  name="click_through_text_fmt">
+    [TELEPORT] teleport, [MAP] map, [PROFILE] profile
+ </panel.string>
+ <panel.string
+  name="date_fmt">
+    [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+ </panel.string>
+ <panel.string
+  name="auto_renew_on">
+    Enabled
+ </panel.string>
+ <panel.string
+  name="auto_renew_off">
+    Disabled
+ </panel.string>
     <button
      follows="top|right"
      height="23"
@@ -51,11 +67,11 @@
      follows="all"
      height="502"
      layout="topleft"
-     left="9"
+     left="10"
      top_pad="10"
      name="profile_scroll"
      reserve_scroll_corner="false"
-     width="310">
+     width="312">
     <panel
      name="scroll_content_panel"
      follows="left|top"
@@ -63,18 +79,28 @@
      layout="topleft"
      top="0"
      background_visible="false"
-     height="500"
+     height="610"
      left="0"
      width="285">
+        <panel
+         name="snapshot_panel"
+         layout="topleft"
+         follows="left|top|right"
+         height="197"
+         left="10"
+         top="10"
+         width="275"
+        >
         <texture_picker
          enabled="false"
          follows="left|top|right"
          height="197"
          layout="topleft"
-         left="11"
+         left="0"
          name="classified_snapshot"
-         top="10"
-         width="286" />
+         top="0"
+         width="275" />
+        </panel>
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -93,20 +119,61 @@
          v_pad="0"
          value="[name]"
          use_ellipses="true" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="classified_location_label"
+         text_color="white"
+         top_pad="5"
+         value="Location:"
+         width="250" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
          follows="left|top"
          h_pad="0"
-         height="25"
+         height="30"
          layout="topleft"
          left="10"
          name="classified_location"
          read_only="true"
+         top_pad="5"
          width="290"
          word_wrap="true"
          v_pad="0"
          value="[loading...]" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="content_type_label"
+         text_color="white"
+         top_pad="10"
+         value="Content Type:"
+         width="140" />
+        <icon
+         follows="top|left"
+         height="16"
+         image_name="Parcel_M_Light"
+         layout="topleft"
+         left_pad="0"
+         name="content_type_moderate"
+         top_pad="-11"
+         width="18" />
+        <icon
+         follows="top|left"
+         height="16"
+         image_name="Parcel_PG_Light"
+         layout="topleft"
+         left_delta="0"
+         name="content_type_general"
+         top_delta="0"
+         width="18" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -114,13 +181,24 @@
          h_pad="0"
          height="18"
          layout="topleft"
-         left="10"
+         left_pad="2"
          name="content_type"
          read_only="true"
-         width="290"
-         top_pad="5"
+         width="130"
+         top_delta="1"
          v_pad="0"
          value="[content type]" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="category_label"
+         text_color="white"
+         top_pad="0"
+         value="Category:"
+         width="140" />
         <text_editor
          allow_html="true"
          allow_scroll="false"
@@ -129,23 +207,51 @@
          h_pad="0"
          height="18"
          layout="topleft"
-         left="10"
+         left_pad="0"
          name="category"
          read_only="true"
-         width="290"
-         top_pad="5"
+         width="150"
+         top_pad="-10"
          v_pad="0"
          value="[category]" />
-        <check_box
-         enabled="false"
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="creation_date_label"
+         text_color="white"
+         top_pad="0"
+         value="Creation date:"
+         width="140" />
+        <text_editor
+         allow_scroll="false"
+         bg_visible="false"
+         follows="left|top"
+         h_pad="0"
+         halign="left"
          height="16"
-         label="Auto renew each week"
+         layout="topleft"
+         left_pad="0"
+         name="creation_date"
+         read_only="true"
+         top_pad="-10"
+         tool_tip="Creation date"
+         v_pad="0"
+         value="[date]"
+         width="150" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
          layout="topleft"
          left="10"
-         name="auto_renew"
+         name="price_for_listing_label"
+         text_color="white"
          top_pad="5"
-         v_pad="0"
-         width="290" />
+         value="Price for listing:"
+         width="140" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -154,29 +260,133 @@
          halign="left"
          height="16"
          layout="topleft"
-         left="10"
+         left_pad="0"
          name="price_for_listing"
          read_only="true"
-         top_pad="5"
+         top_pad="-10"
          tool_tip="Price for listing."
          v_pad="0"
+         value="[price]"
          width="105" />
+        <layout_stack
+         animate="false"
+         name="descr_stack"
+         layout="topleft"
+         follows="all"
+         orientation="vertical"
+         left="10"
+         top_pad="5"
+         width="290"
+         height="215">
+         <layout_panel
+          auto_resize="false"
+          name="clickthrough_layout_panel"
+          layout="topleft"
+          follows="all"
+          left="0"
+          top="0"
+          width="290"
+          height="16"
+          user_resize="false">
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="0"
+         name="click_through_label"
+         text_color="white"
+         top_pad="0"
+         value="Clicks:"
+         width="140" />
         <text_editor
-         allow_html="true"
          allow_scroll="false"
          bg_visible="false"
-         follows="left|top|right"
+         follows="left|top"
+         h_pad="0"
+         halign="left"
+         height="16"
+         layout="topleft"
+         left_pad="0"
+         name="click_through_text"
+         read_only="true"
+         top_pad="-10"
+         tool_tip="Click through data"
+         v_pad="0"
+         value="[clicks]"
+         width="150" />
+         </layout_panel>
+         <layout_panel
+          auto_resize="false"
+          name="price_layout_panel"
+          layout="topleft"
+          follows="all"
+          left="0"
+          top="0"
+          width="290"
+          height="16"
+          user_resize="false">
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="0"
+         name="auto_renew_label"
+         text_color="white"
+         top="0"
+         value="Auto renew:"
+         width="140" />
+         <text
+         height="16"
+         layout="topleft"
+         follows="top|left"
+         left_pad="0"
+         name="auto_renew"
+         top_pad="-10"
+         value="Enabled" 
+         width="150" />
+         </layout_panel>
+         <layout_panel
+          name="descr_layout_panel"
+          layout="topleft"
+          follows="all"
+          left="0"
+          top="0"
+          width="290"
+          height="215"
+          user_resize="false">
+        <text
+         auto_resize="false"
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="0"
+         name="classified_desc_label"
+         text_color="white"
+         top="0"
+         value="Description:"
+         width="250" />
+        <text_editor
+         allow_html="true"
+         allow_scroll="true"
+         bg_visible="false"
+         follows="all"
          h_pad="0"
          height="200"
          layout="topleft"
-         left="10"
+         left="0"
          max_length="1023"
          name="classified_desc"
          read_only="true"
-         width="290"
+         top_pad="7"
+         width="280"
          v_pad="0"
          value="[description]"
          word_wrap="true" />
+         </layout_panel>
+        </layout_stack>
     </panel>
     </scroll_container>
     <panel
diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index 1375eb87d9..996e28c575 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="description"
+     textbox.max_length="1024"
      textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index 66d5389d9b..74d63ab328 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -16,6 +16,12 @@
   name="location_notice">
     (will update after save)
  </panel.string>
+ <string name="publish_label">
+  Publish
+ </string>
+ <string name="save_label">
+  Save
+ </string>
   <button
      follows="top|right"
      height="23"
@@ -42,16 +48,16 @@
         Edit Classified
     </text>
    <scroll_container
-     color="DkGray2"
-     follows="all"
-     height="502"
-     layout="topleft"
-     left="8"
-     top_pad="10"
-     name="profile_scroll"
-     reserve_scroll_corner="false"
-     opaque="true"
-     width="312">
+    color="DkGray2"
+    follows="all"
+    height="502"
+    layout="topleft"
+    left="8"
+    top_pad="10"
+    name="profile_scroll"
+    reserve_scroll_corner="false"
+    opaque="true"
+    width="312">
     <panel
      name="scroll_content_panel"
      follows="left|top"
@@ -59,27 +65,36 @@
      layout="topleft"
      top="0"
      background_visible="false"
-     height="610"
+     height="690"
      left="0"
      width="285">
-    <texture_picker
-     follows="left|top|right"
-     height="197"
-     width="272"
-     layout="topleft"
-     top="10"
-     left="11"
-     name="classified_snapshot" />
-          <icon
+      <panel
+         name="snapshot_panel"
+         layout="topleft"
+         follows="left|top|right"
+         height="197"
+         left="10"
+         top="10"
+         width="272">
+      <texture_picker
+       follows="left|top|right"
+       height="197"
+       width="272"
+       layout="topleft"
+       top="0"
+       left="0"
+       name="classified_snapshot" />
+       <icon
            height="197"
            image_name="spacer24.tga"
            layout="topleft"
            name="edit_icon"
            label=""
            tool_tip="Click to select an image"
-           top="10"
-           left="11"
-           width="286" />
+           top="0"
+           left="0"
+           width="272" />
+       </panel>
         <text
          type="string"
          length="1"
@@ -153,7 +168,7 @@
          type="string"
          length="1"
          follows="left|top"
-         height="50"
+         height="30"
          layout="topleft"
          left="10"
          name="classified_location"
@@ -172,6 +187,17 @@
          top_pad="5"
          name="set_to_curr_location_btn"
          width="156" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="category_label"
+         text_color="white"
+         top_pad="15"
+         value="Category:"
+         width="250" />
         <combo_box
          follows="left|top" 
          height="23" 
@@ -180,25 +206,63 @@
          name="category" 
          top_pad="5"
          width="156" />
-        <combo_box 
-         allow_text_entry="false" 
-         follows="left|top" 
-         height="23" 
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
          left="10"
-         name="content_type" 
+         name="content_type_label"
+         text_color="white"
+         top_pad="15"
+         value="Content type:"
+         width="250" />
+        <icons_combo_box
+         follows="left|top"
+         height="23"
+         label="General Content"
+         layout="topleft"
+         left="10"
+         name="content_type"
          top_pad="5"
          width="156">
-         <combo_item 
-          name="mature_ci" 
-          value="Mature">
-           Moderate Content
-         </combo_item>
-         <combo_item 
-          name="pg_ci" 
-          value="PG">
-           General Content
-         </combo_item>
-        </combo_box>
+            <icons_combo_box.drop_down_button
+             image_overlay="Parcel_PG_Light"
+             image_overlay_alignment="left"
+             imgoverlay_label_space="3"
+             pad_left="3"/>
+            <icons_combo_box.item
+             label="Moderate Content"
+             name="mature_ci"
+             value="Mature">
+                <item.columns
+                 halign="center"
+                 type="icon"
+                 value="Parcel_M_Light"
+                 width="20"/>
+            </icons_combo_box.item>
+            <icons_combo_box.item
+             label="General Content"
+             name="pg_ci"
+             value="PG">
+                <item.columns
+                 halign="center"
+                 type="icon"
+                 value="Parcel_PG_Light"
+                 width="20"/>
+            </icons_combo_box.item>
+        </icons_combo_box>
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="price_for_listing_label"
+         text_color="white"
+         top_pad="15"
+         value="Price for listing:"
+         width="250" />
         <spinner
          decimal_digits="0"
          follows="left|top"
@@ -223,9 +287,9 @@
          layout="topleft"
          left="10"
          name="auto_renew"
-         top_pad="5"
+         top_pad="15"
          width="250" />
-    </panel>
+     </panel>
     </scroll_container>
     <panel
      follows="left|right|bottom"
@@ -239,7 +303,7 @@
         <button
          follows="bottom|left"
          height="23"
-         label="Save"
+         label="[LABEL]"
          layout="topleft"
          name="save_changes_btn"
          left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 4e57b428bd..701a14e1c5 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -44,11 +44,16 @@ background_visible="true"
      tab_stop="false"
      top="2"
      width="23" />
-    <text
+    <text_editor
+     allow_scroll="false"
+     bg_visible="false"
+     read_only = "true"
      layout="topleft"
      name="group_name"
+     v_pad="0"
      value="(Loading...)"
       font="SansSerifHugeBold"
+     h_pad="0"
       height="26"
       left_pad="10"
      text_color="LtGray"
@@ -100,17 +105,8 @@ background_visible="true"
             expanded="true"
             layout="topleft"
             name="group_general_tab"
-            title="General">
-               <scroll_container
-                 color="DkGray2"
-                 follows="all"
-                 layout="topleft"
-                 left="0"
-                 name="profile_scroll"
-                 opaque="true"
-                 height="604"
-                 width="304"
-                 top="0">
+            title="General"
+            fit_panel="false">
                    <panel
                       border="false"
                       class="panel_group_general"
@@ -121,24 +117,13 @@ background_visible="true"
                       help_topic="group_general_tab"
                       name="group_general_tab_panel"
                       top="0" />
-			   </scroll_container>
          </accordion_tab>
          <accordion_tab
             expanded="false"
             layout="topleft"
             name="group_roles_tab"
-            title="Roles">
-               <scroll_container
-                 color="DkGray2"
-                 follows="all"
-                 layout="topleft"
-                 left="0"
-                 name="profile_scroll"
-                 opaque="true"
-                 height="680"
-                 width="304"
-                 top="0">
-
+            title="Roles"
+            fit_panel="false">
                 <panel
                    border="false"
                    class="panel_group_roles"
@@ -148,24 +133,13 @@ background_visible="true"
                    left="0"
                    name="group_roles_tab_panel"
                    top="0" />
-                </scroll_container>
          </accordion_tab>
          <accordion_tab
             expanded="false"
             layout="topleft"
             name="group_notices_tab"
-            title="Notices">
-               <scroll_container
-                 color="DkGray2"
-                 follows="all"
-                 layout="topleft"
-                 left="0"
-                 name="profile_scroll"
-                 opaque="true"
-                 height="530"
-                 width="304"
-                 top="0">
-
+            title="Notices"
+            fit_panel="false">
                 <panel
                     border="false"
                     class="panel_group_notices"
@@ -176,24 +150,13 @@ background_visible="true"
                     help_topic="group_notices_tab"
                     name="group_notices_tab_panel"
                     top="0" />
-               </scroll_container>
          </accordion_tab>
          <accordion_tab
              expanded="false"
              layout="topleft"
              name="group_land_tab"
-             title="Land/Assets">
-               <scroll_container
-                 color="DkGray2"
-                 follows="all"
-                 layout="topleft"
-                 left="0"
-                 name="profile_scroll"
-                 opaque="true"
-                 height="500"
-                 width="304"
-                 top="0">
-
+             title="Land/Assets"
+             fit_panel="false">
                  <panel
 					 border="false"
                      class="panel_group_land_money"
@@ -203,7 +166,6 @@ background_visible="true"
                      left="0"
                      name="group_land_tab_panel"
                      top="0" />
-               </scroll_container>
          </accordion_tab>
          </accordion>
    </layout_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 28c4adf67c..88566ea037 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
@@ -111,7 +111,7 @@
          layout="topleft"
          min_height="25"
          width="100"
-         name="share_btn_panel"
+         name="pay_btn_panel"
          user_resize="false">
            <button
              auto_resize="true"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index e6f67078d1..50983d2976 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -415,6 +415,7 @@ halign="center"
          layout="topleft"
          left="0"
          name="All Items"
+         sort_order_setting="InventorySortOrder"
          top="16"
          width="290" />
         <inventory_panel
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 540e17e413..13791a6d32 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -28,6 +28,16 @@
     <string
      name="groups_filter_label"
      value="Filter Groups" />
+     <!--
+     *WORKAROUND: for group_list.no_groups_msg & group_list.no_filtered_groups_msg attributes.
+     They are not defined as translatable in VLT. See EXT-5931
+     -->
+    <string
+     name="no_filtered_groups_msg"
+     value="[secondlife:///app/search/groups Try finding the group in search?]" />
+    <string
+     name="no_groups_msg"
+     value="[secondlife:///app/search/groups Try searching for some groups to join.]" />
     <filter_editor
      text_pad_left="10"
      follows="left|top|right"
@@ -222,7 +232,7 @@
              top="10"
              width="293"
              wrap="true">
-                To add friends try [secondlife:///app/search/people global search] or use right-click on a user to add them as a friend.
+                To add friends try [secondlife:///app/search/people global search] or use right-click on a Resident to add them as a friend.
 If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
              </text>
         </panel>
@@ -240,13 +250,17 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
          name="groups_panel"
          top="0"
          width="313">
+    <!--
+     *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931
+     Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild()
+    -->
             <group_list
              follows="all"
              height="345"
              layout="topleft"
              left="0"
              name="group_list"
-             no_filtered_groups_msg="[secondlife:///app/search/groups Try fine the group in search?]"
+             no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]"
              no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]"
              top="0"
              width="313" />
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 8b25fb5d2a..715dc5f23c 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
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="picture_descr"
+     textbox.max_length="1024"
      textbox.show_context_menu="false" 
      top_pad="0"
      width="178"
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 44b2508e56..1e7c51259c 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -325,6 +325,7 @@
              top_pad="10"
              width="313">
                 <accordion_tab
+                 height="170"
                  layout="topleft"
                  name="parcel_characteristics_tab"
                  title="Parcel">
@@ -333,6 +334,7 @@
                      height="160"
                      layout="topleft"
                      left="0"
+                     name="parcel_characteristics_panel"
                      top="0"
                      width="275">
                         <icon
@@ -536,6 +538,7 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
+                 height="150"
                  layout="topleft"
                  name="region_information_tab"
                  title="Region">
@@ -544,6 +547,7 @@
                      height="125"
                      layout="topleft"
                      left="0"
+                     name="region_information_panel"
                      top="0"
                      width="290">
                         <text
@@ -662,6 +666,7 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
+                 height="190"
                  layout="topleft"
                  name="estate_information_tab"
                  title="Estate">
@@ -670,6 +675,7 @@
                      height="189"
                      layout="topleft"
                      left="0"
+                     name="estate_information_panel"
                      top="0"
                      width="290">
                         <text
@@ -750,6 +756,7 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
+                 height="320"
                  layout="topleft"
                  name="sales_tab"
                  title="For Sale">
@@ -758,6 +765,7 @@
                      height="300"
                      layout="topleft"
                      left="0"
+                     name="sales_panel"
                      top="0"
                      width="290">
                         <text
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 05a3771edf..4be4d6b432 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -171,6 +171,7 @@ Automatic position for:
      height="50"
      layout="topleft"
      left_pad="10"
+     top="190"
      name="background"
      tool_tip="Choose color for bubble chat"
      width="38">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 2e81139ef2..3d434361b9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -14,6 +14,7 @@
    layout="topleft"
    left="30"
    height="12"
+   name="font_size"
    width="120"
    top="10">
     Font size:
@@ -60,6 +61,7 @@
       layout="topleft"
       left="30"
       height="12"
+      name="font_colors" 
       top_pad="10" 
       width="120"
       >
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 f20526b491..c74de043e9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -635,7 +635,7 @@
         left_delta="-230"
         name="LightingDetailText"
         top_pad="8"
-        width="128">
+        width="140">
            Lighting detail:
         </text>
         <radio_group
@@ -672,10 +672,10 @@
         follows="left|top"
         height="12"
         layout="topleft"
-        left="360"
+        left="358"
         name="TerrainDetailText"
         top="465"
-        width="128">
+        width="155">
            Terrain detail:
         </text>
         <radio_group
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index a7cdd241c5..e03ecd8f04 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -51,7 +51,7 @@
      name="mute_when_minimized"
 	   top_delta="3"
      left_pad="5"
-     width="215" />
+     width="235" />
 	<slider
 		control_name="AudioLevelUI"
 		disabled_control="MuteAudio"
@@ -329,7 +329,7 @@
 	   left="80"
 	   top_delta="16"
      name="Listen from"
-     width="80">
+     width="142">
         Listen from:
     </text>
 	<icon
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 3980eb86d3..3913b6d709 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -198,7 +198,7 @@
     <button
      follows="left|top"
      height="23"
-     label="Kick User from Estate..."
+     label="Kick Resident from Estate..."
      layout="topleft"
      left="50"
      name="kick_user_from_estate_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index c06e67a4bb..ca9579284b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -171,27 +171,51 @@
      width="100">
         Rating:
     </text>
-    <combo_box
+    <icons_combo_box
+     follows="left|top"
      height="20"
      label="Moderate"
      layout="topleft"
      left_delta="100"
      name="access_combo"
      top_delta="0"
-     width="85">
-        <combo_box.item
+     width="105">
+        <icons_combo_box.drop_down_button
+         image_overlay="Parcel_M_Light"
+         image_overlay_alignment="left"
+         imgoverlay_label_space="3"
+         pad_left="3"/>
+        <icons_combo_box.item
          label="Adult"
          name="Adult"
-         value="42" />
-        <combo_box.item
+         value="42">
+            <item.columns
+             halign="center"
+             type="icon"
+             value="Parcel_R_Light"
+             width="20"/>
+          </icons_combo_box.item>
+        <icons_combo_box.item
          label="Moderate"
          name="Mature"
-         value="21" />
-        <combo_box.item
+         value="21">
+            <item.columns
+             halign="center"
+             type="icon"
+             value="Parcel_M_Light"
+             width="20"/>
+        </icons_combo_box.item>
+        <icons_combo_box.item
          label="General"
          name="PG"
-         value="13" />
-    </combo_box>
+         value="13">
+            <item.columns
+             halign="center"
+             type="icon"
+             value="Parcel_PG_Light"
+             width="20"/>
+        </icons_combo_box.item>
+    </icons_combo_box>
     <button
      enabled="false"
      follows="left|top"
@@ -205,7 +229,7 @@
     <button
      follows="left|top"
      height="20"
-     label="Teleport Home One User..."
+     label="Teleport Home One Resident..."
      layout="topleft"
      left="10"
      name="kick_btn"
@@ -214,7 +238,7 @@
     <button
      follows="left|top"
      height="20"
-     label="Teleport Home All Users..."
+     label="Teleport Home All Residents..."
      layout="topleft"
      left_delta="0"
      name="kick_all_btn"
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
index 525c5aa8e7..ffa1a257d5 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
@@ -203,7 +203,7 @@
    <button
      follows="left|top"
      height="20"
-     label="Teleport Home One User..."
+     label="Teleport Home One Resident..."
      layout="topleft"
      left="10"
      name="kick_btn"
@@ -212,7 +212,7 @@
     <button
      follows="left|top"
      height="20"
-     label="Teleport Home All Users..."
+     label="Teleport Home All Residents..."
      layout="topleft"
      left_delta="0"
      name="kick_all_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
index 04dbf73be9..5d910ea659 100644
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -148,103 +148,33 @@
      name="height_text_lbl6"
      top="185"
      width="100">
-        Southwest
-    </text>
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="height_text_lbl7"
-     top_delta="0"
-     width="100">
         Northwest
     </text>
-   <spinner
-    follows="left|top"
-    height="20"
-    increment="0.5"
-    label="Low"
-    label_width="37"
-    layout="topleft"
-    left="10"
-    max_val="500"
-    min_val="-500"
-    name="height_start_spin_0"
-    top_delta="15"
-    width="100" />
-  <spinner
-   follows="left|top"
-   height="20"
-   increment="0.5"
-   label="Low"
-   label_width="37"
-   layout="topleft"
-   left_pad="10"
-   max_val="500"
-   min_val="-500"
-   name="height_start_spin_1"
-   top_delta="0"
-   width="100" />
-  <spinner
-   follows="left|top"
-   height="20"
-   increment="0.5"
-   label="High"
-   label_width="37"
-   layout="topleft"
-   left="10"
-   max_val="500"
-   min_val="-500"
-   name="height_range_spin_0"
-   top_delta="20"
-   width="100" />
-  <spinner
-   follows="left|top"
-   height="20"
-   increment="0.5"
-   label="High"
-   label_width="37"
-   layout="topleft"
-   left_pad="10"
-   max_val="500"
-   min_val="-500"
-   name="height_range_spin_1"
-   top_delta="0"
-   width="100" />
-    <text
-     follows="left|top"
-     height="20"
-     layout="topleft"
-     left="51"
-     name="height_text_lbl8"
-     top_pad="10"
-     width="100">
-        Southeast
-    </text>
     <text
      follows="left|top"
      height="20"
      layout="topleft"
      left_pad="10"
-     name="height_text_lbl9"
+     name="height_text_lbl7"
      top_delta="0"
      width="100">
         Northeast
     </text>
-      <spinner
-       follows="left|top"
-       height="20"
-       increment="0.5"
-       label="Low"
-       label_width="37"
-       layout="topleft"
-       left="10"
-       max_val="500"
-       min_val="-500"
-       name="height_start_spin_2"
-       top_delta="15"
-       width="100" />
+<!--  northwest low-->
+     <spinner
+      follows="left|top"
+      height="20"
+      increment="0.5"
+      label="Low"
+      label_width="37"
+      layout="topleft"
+      left="10"
+      max_val="500"
+      min_val="-500"
+      name="height_start_spin_1"
+      top_delta="15"
+      width="100" />  
+<!--    northeast low-->
       <spinner
        follows="left|top"
        height="20"
@@ -258,20 +188,22 @@
        name="height_start_spin_3"
        top_delta="0"
        width="100" />
-      <spinner
-       follows="left|top"
-       height="20"
-       increment="0.5"
-       label="High"
-       label_width="37"
-       layout="topleft"
-       left="10"
-       max_val="500"
-       min_val="-500"
-       name="height_range_spin_2"
-       top_delta="20"
-       width="100" />
-      <spinner
+<!--  northwest high-->
+     <spinner
+      follows="left|top"
+      height="20"
+      increment="0.5"
+      label="High"
+      label_width="37"
+      layout="topleft"
+      left="10"
+      max_val="500"
+      min_val="-500"
+      name="height_range_spin_1"
+      top_delta="20"
+      width="100" />
+<!--  northeast high-->
+    <spinner
        follows="left|top"
        height="20"
        increment="0.5"
@@ -284,18 +216,94 @@
        name="height_range_spin_3"
        top_delta="0"
        width="100" />
-      <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left="10"
-       name="height_text_lbl10"
-       top_delta="30"
-       width="400"
-       word_wrap="true">
-        These values represent the blend range for the textures above.
-      </text>
-      <text
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="51"
+     name="height_text_lbl8"
+     top_pad="10"
+     width="100">
+        Southwest
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl9"
+     top_delta="0"
+     width="100">
+        Southeast
+    </text>
+<!--  southwest low-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="Low"
+     label_width="37"
+     layout="topleft"
+     left="10"
+     max_val="500"
+     min_val="-500"
+     name="height_start_spin_0"
+     top_delta="15"
+     width="100" />
+<!--  southeast low-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="Low"
+     label_width="37"
+     layout="topleft"
+     left_pad="10"
+     max_val="500"
+     min_val="-500"
+     name="height_start_spin_2"
+     top_delta="0"
+     width="100" />
+<!--southwest high-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="High"
+     label_width="37"
+     layout="topleft"
+     left="10"
+     max_val="500"
+     min_val="-500"
+     name="height_range_spin_0"
+     top_delta="20"
+     width="100" />
+<!--  southeast high-->
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="High"
+     label_width="37"
+     layout="topleft"
+     left_pad="10"
+     max_val="500"
+     min_val="-500"
+     name="height_range_spin_2"
+     top_delta="0"
+     width="100" />
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl10"
+     top_delta="30"
+     width="400"
+     word_wrap="true">
+      These values represent the blend range for the textures above.
+    </text>
+    <text
        follows="left|top"
        height="20"
        layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index d14355b9f4..d444420550 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -178,5 +178,5 @@
      top_pad="-35"
      right="487"
      name="Save_btn"
-     width="61" />
+     width="81" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index c188c1bf8b..0c870e155b 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -3,7 +3,7 @@
  background_opaque="true"
  background_visible="true"
  bg_opaque_color="MouseGray"
- chrome="true" 
+ chrome="true"
  follows="top|right"
  height="19"
  layout="topleft"
@@ -11,7 +11,7 @@
  mouse_opaque="false"
  name="status"
  top="19"
- tab_stop="false" 
+ tab_stop="false"
  width="1000">
     <panel.string
      name="StatBarDaysOfWeek">
@@ -51,12 +51,12 @@
      image_unselected="spacer35.tga"
      image_pressed="spacer35.tga"
      height="16"
-     right="-210"
+     right="-230"
      label_shadow="false"
      name="buycurrency"
      tool_tip="My Balance"
      top="3"
-     width="110" />
+     width="120" />
     <button
      auto_resize="true"
      halign="right"
@@ -75,7 +75,7 @@
      pad_bottom="2"
      tool_tip="Click to buy more L$"
      top="2"
-     width="45" />
+     width="55" />
     <text
      type="string"
      font="SansSerifSmall"
@@ -88,7 +88,7 @@
      left_pad="0"
      name="TimeText"
      tool_tip="Current time (Pacific)"
-     width="80">
+     width="100">
         24:00 AM PST
     </text>
     <button
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 d2c9e56bc3..86739b24c8 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -94,6 +94,7 @@
          layout="topleft"
          left="10"
          help_topic=""
+         name="properties_panel"
          top="45"
          width="313"
    background_visible="true"
@@ -549,5 +550,16 @@
 		     name="buy_btn"
 		     top="0"
 		     width="100" />
+        <button
+		     follows="bottom|left"
+		     height="23"
+		     label="Details"
+		     layout="topleft"
+		     left="5"
+		     name="details_btn"
+		     top="0"
+		     width="100"
+			 visible="false" />
+
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 455b4be264..59c54f0cad 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1769,6 +1769,9 @@ Clears (deletes) the media and all params from the given face.
 	<string name="tattoo">Tattoo</string>
 	<string name="invalid">invalid</string>
 
+  <!-- Wearable List-->
+  <string name="NewWearable">New [WEARABLE_ITEM]</string>
+  
 	<!-- LLGroupNotify -->
 	<!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
 	<string name="next">Next</string>
@@ -2104,6 +2107,9 @@ Clears (deletes) the media and all params from the given face.
 	<!-- panel contents -->
 	<string name="PanelContentsNewScript">New Script</string>
 
+  <!-- panel preferences general -->
+  <string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
+
 	<!-- Mute -->
 	<string name="MuteByName">(by name)</string>
 	<string name="MuteAgent">(Resident)</string>
diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml
index e8f6b1319a..bae821d3b5 100644
--- a/indra/newview/skins/default/xui/en/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/en/teleport_strings.xml
@@ -61,6 +61,9 @@ Try again in a moment.
 		<message name="completing">
 			Completing teleport.
 		</message>
+		<message name="completed_from">
+			Teleport completed from [T_SLURL]
+		</message>
 		<message name="resolving">
 			Resolving destination.
 		</message>
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
index 63f08a4250..413ca1d1ef 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
@@ -24,7 +24,7 @@
      follows="left|top|bottom"
      height="20"
      left="2"
-     mouse_opaque="true"
+     mouse_opaque="false"
      name="adhoc_icon"
      width="21" />
     <chiclet_im_adhoc.unread_notifications