Merge changes from product-engine

15 files changed, 983 insertions, 283 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 48c7236796..e881665578 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -38,6 +38,8 @@
   <texture name="Blank" file_name="Blank.png" preload="false" />
 
   <texture name="BottomTray_BG" file_name="bottomtray/BottomTray_BG.png" preload="false" />
+  <texture name="BottomTray_Scroll_Right" file_name="navbar/Arrow_Right_Off.png" preload="false" />
+  <texture name="BottomTray_Scroll_Left" file_name="navbar/Arrow_Left_Off.png" preload="false" />
 
   <texture name="BuyArrow_Off" file_name="navbar/BuyArrow_Off.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0"  />
   <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0"  />
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
new file mode 100644
index 0000000000..c3283c6014
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Participant List Context Menu">
+    <menu_item_check
+     label="Mute Text"
+     layout="topleft"
+     name="MuteText">
+        <on_check
+         function="ParticipantList.CheckItem"
+         parameter="is_muted" />
+        <on_click
+         function="ParticipantList.ToggleMuteText" />
+        <on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_mute_text" />
+    </menu_item_check>
+    <menu_item_check
+     label="Allow text chat"
+     layout="topleft"
+     name="AllowTextChat">
+        <on_check
+         function="ParticipantList.CheckItem"
+         parameter="is_allowed_text_chat" />
+        <on_click
+         function="ParticipantList.ToggleAllowTextChat" />
+        <on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_allow_text_chat" />
+    </menu_item_check>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
index c002cd078f..39f9e48609 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
@@ -2,15 +2,36 @@
 <menu name="menu_group_plus"
      left="0" bottom="0" visible="false"
      mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
-  <menu_item_call name="sort_recent" label="Sort by Recent Speakers">
-    <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="sort_recent" />
-  </menu_item_call>
-  <menu_item_call name="sort_name" label="Sort by Name">
-    <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="sort_name" />
-  </menu_item_call>
-  <menu_item_call name="sort_distance" label="Sort by Distance">
-    <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="sort_distance" />
-  </menu_item_call>
+  <menu_item_check
+     label="Sort by Recent Speakers"
+     name="sort_by_recent_speakers">
+    <menu_item_check.on_click
+       function="People.Nearby.ViewSort.Action"
+       parameter="sort_by_recent_speakers"/>
+    <menu_item_check.on_check
+       function="People.Nearby.ViewSort.CheckItem"
+       parameter="sort_by_recent_speakers"/>
+  </menu_item_check>
+  <menu_item_check
+     label="Sort by Name"
+     name="sort_name">
+    <menu_item_check.on_click
+       function="People.Nearby.ViewSort.Action"
+       parameter="sort_name"/>
+    <menu_item_check.on_check
+       function="People.Nearby.ViewSort.CheckItem"
+       parameter="sort_name"/>
+  </menu_item_check>
+  <menu_item_check
+     label="Sort by Distance"
+     name="sort_distance">
+    <menu_item_check.on_click
+       function="People.Nearby.ViewSort.Action"
+       parameter="sort_distance"/>
+    <menu_item_check.on_check
+       function="People.Nearby.ViewSort.CheckItem"
+       parameter="sort_distance"/>
+  </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_check name="view_icons" label="View People Icons">
     <menu_item_check.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_picks_plus.xml b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
new file mode 100644
index 0000000000..3065239615
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ height="201"
+ layout="topleft"
+ mouse_opaque="false"
+ name="picks_plus_menu"
+ width="120">
+    <menu_item_call 
+     name="create_pick" 
+     label="New Pick">
+        <menu_item_call.on_click 
+         function="Picks.Plus.Action" 
+         userdata="new_pick" />
+        </menu_item_call>
+    <menu_item_call 
+     name="create_classified" 
+     label="New Classified">
+        <menu_item_call.on_click 
+         function="Picks.Plus.Action" 
+         userdata="new_classified" />
+    </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 989dc88851..ccd8bc569e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3051,6 +3051,18 @@ Teleport to [PICK]?
   </notification>
 
   <notification
+   icon="alertmodal.tga"
+   name="TeleportToClassified"
+   type="alertmodal">
+    Teleport to [CLASSIFIED]?
+    <usetemplate
+     ignoretext="Confirm that I want to teleport to a location in Classifieds"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Teleport"/>
+  </notification>
+
+  <notification
    icon="alert.tga"
    label="Message everyone in your Estate"
    name="MessageEstate"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 3fbc8e1afd..9fc897b93e 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -241,7 +241,32 @@
              top="0"
              chiclet_padding="3"
              scrolling_offset="40"
-             width="189" />
+             width="189">
+                <button
+                 auto_resize="true"
+                 follows="right"
+                 height="23"
+                 image_selected="BottomTray_Scroll_Left"
+                 image_unselected="BottomTray_Scroll_Left"
+                 layout="topleft"
+                 name="chicklet_left_scroll_button"
+                 tab_stop="false"
+                 top="3"
+                 visible="false"
+                 width="20" />
+                <button
+                 auto_resize="true"
+                 follows="right"
+                 height="23"
+                 image_selected="BottomTray_Scroll_Right"
+                 image_unselected="BottomTray_Scroll_Right"
+                 layout="topleft"
+                 name="chicklet_right_scroll_button"
+                 tab_stop="false"
+                 top="3"
+                 visible="false"
+                 width="20" />
+            </chiclet_panel>
         </layout_panel>
         <icon
          auto_resize="false"
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
new file mode 100644
index 0000000000..bdca8531dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ follows="all"
+ height="570"
+ layout="topleft"
+ left="0"
+ min_height="350"
+ name="panel_classified_info"
+ top="0"
+ width="333">
+ <panel.string
+  name="type_mature">
+    Mature
+ </panel.string>
+ <panel.string
+  name="type_pg">
+    PG Content
+ </panel.string>
+    <button
+     follows="top|right"
+     height="23"
+     image_overlay="BackArrow_Off"
+     layout="topleft"
+     name="back_btn"
+     picture_style="true"
+     left="10"
+     tab_stop="false"
+     top="2"
+     width="23" />
+    <text
+     follows="top|left|right"
+     font="SansSerifHugeBold"
+     height="26"
+     layout="topleft"
+     left_pad="10"
+     name="title"
+     text_color="white"
+     top="0"
+     value="Classified Info"
+     use_ellipses="true"
+     width="275" />
+    <scroll_container
+     color="DkGray2"
+     opaque="true"
+     follows="all"
+     height="500"
+     layout="topleft"
+     left="10"
+     top_pad="10"
+     name="profile_scroll"
+     reserve_scroll_corner="false"
+     width="313">
+    <panel
+     name="scroll_content_panel"
+     follows="left|top"
+     min_height="300"
+     layout="topleft"
+     top="0"
+     background_visible="false"
+     height="500"
+     left="0"
+     width="295">
+        <texture_picker
+         enabled="false"
+         follows="left|top"
+         height="197"
+         layout="topleft"
+         left="10"
+         name="classified_snapshot"
+         top="20"
+         width="290" />
+        <text
+         follows="left|top|right"
+         height="35"
+         width="290"
+         layout="topleft"
+         font="SansSerifBig"
+         font.style="BOLD"
+         left="10"
+         top_pad="10"
+         name="classified_name"
+         text_color="white"
+         value="[name]"
+         use_ellipses="true" />
+        <text
+         follows="left|top"
+         height="25"
+         layout="topleft"
+         left="10"
+         name="classified_location"
+         width="290"
+         word_wrap="true"
+         value="[loading...]" />
+        <text
+         follows="left|top|right"
+         height="18"
+         layout="topleft"
+         left="10"
+         name="content_type"
+         width="290"
+         top_pad="5"
+         value="[content type]" />
+        <text
+         follows="left|top|right"
+         height="18"
+         layout="topleft"
+         left="10"
+         name="category"
+         width="290"
+         top_pad="5"
+         value="[category]" />
+        <check_box
+         enabled="false"
+         height="16"
+         label="Auto renew each week"
+         layout="topleft"
+         left="10"
+         name="auto_renew"
+         top_pad="5"
+         width="290" />
+        <text
+         follows="left|top"
+         halign="left"
+         height="16"
+         layout="topleft"
+         left="10"
+         name="price_for_listing"
+         top_pad="5"
+         tool_tip="Price for listing."
+         width="105">
+         L$[PRICE]
+        </text>
+        <text
+         follows="left|top|right"
+         height="200"
+         layout="topleft"
+         left="10"
+         name="classified_desc"
+         width="290"
+         value="[description]"
+         word_wrap="true" />
+    </panel>
+    </scroll_container>
+    <panel
+     follows="left|right|bottom"
+     height="20"
+     layout="topleft"
+     top_pad="8"
+     left="10"
+     name="buttons">
+        <button
+         follows="bottom|left"
+         font="SansSerifSmall"
+         height="19"
+         label="Teleport"
+         layout="topleft"
+         left="0"
+         name="teleport_btn"
+         top="0"
+         width="90" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmall"
+         height="19"
+         label="Map"
+         layout="topleft"
+         left_pad="10"
+         name="show_on_map_btn"
+         top="0"
+         width="90" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmall"
+         height="19"
+         label="Edit"
+         layout="topleft"
+         right="-1"
+         name="edit_btn"
+         top="0"
+         width="90" />
+    </panel>
+</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
new file mode 100644
index 0000000000..ee333be0cb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ bevel_style="none"
+ follows="top|left|right"
+ height="85"
+ layout="topleft"
+ left="0"
+ name="classified_item"
+ top="0"
+ width="313">
+    <icon
+     follows="all"
+     height="85"
+     image_name="ListItem_Over"
+     right="-3"
+     mouse_opaque="false"
+     name="hovered_icon"
+     top="1"
+     scale_image="true"
+     visible="false"
+     width="307"/>
+    <icon
+     follows="all"
+     height="85"
+     image_name="ListItem_Select"
+     right="-3"
+     mouse_opaque="false"
+     name="selected_icon"
+     top="1"
+     scale_image="true"
+     visible="false"
+     width="307"/>
+    <texture_picker
+     allow_no_texture="true"
+     border_enabled="true"
+     default_image_name="TabIcon_Places_Large"
+     enabled="false"
+     follows="left|top"
+     height="80"
+     layout="topleft"
+     left="10"
+     mouse_opaque="false"
+     name="picture"
+     tab_stop="false"
+     top="10"
+     top_pad="10"
+     width="90" />
+    <text
+     follows="top|left|right"
+     font="SansSerifSmallBold"
+     height="16"
+     layout="topleft"
+     left="110"
+     name="name"
+     text_color="white"
+     top="9"
+     use_ellipses="false"
+     width="197"
+     word_wrap="false" />
+    <expandable_text
+     follows="top|left|right"
+     font="SansSerifSmall"
+     height="40"
+     layout="topleft"
+     left="110"
+     name="description"
+     top_pad="3"
+     width="178"
+     word_wrap="true" />
+    <button
+     follows="top|right"
+     height="16"
+     image_selected="BuyArrow_Press"
+     image_pressed="BuyArrow_Press"
+     image_unselected="BuyArrow_Press"
+     layout="topleft"
+     name="info_chevron"
+     picture_style="true"
+     right="-7"
+     tab_stop="false"
+     top="27"
+     width="16" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
new file mode 100644
index 0000000000..2f3277804f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ bevel_style="in"
+ follows="left|top|right|bottom"
+ height="570"
+ label="Edit Classified"
+ layout="topleft"
+ left="0"
+ min_height="350"
+ name="panel_edit_classified"
+ top="0"
+ width="333">
+ <panel.string
+  name="location_notice">
+    (will update after save)
+ </panel.string>
+  <button
+     follows="top|right"
+     height="23"
+     image_overlay="BackArrow_Off"
+     layout="topleft"
+     name="back_btn"
+     picture_style="true"
+     left="10"
+     tab_stop="false"
+     top="2"
+     width="23" />
+   <text
+     type="string"
+     length="1"
+     follows="top"
+     font="SansSerifHuge"
+     height="15"
+     layout="topleft"
+     left_pad="10"
+     name="title"
+     text_color="white"
+     top="5"
+     width="250">
+        Edit Classified
+    </text>
+   <scroll_container
+     color="DkGray2"
+     follows="all"
+     height="510"
+     layout="topleft"
+     left="10"
+     top_pad="10"
+     name="profile_scroll"
+     reserve_scroll_corner="false"
+     opaque="true"
+     width="313">
+    <panel
+     name="scroll_content_panel"
+     follows="left|top"
+     min_height="300"
+     layout="topleft"
+     top="0"
+     background_visible="false"
+     height="600"
+     left="0"
+     width="295">
+    <texture_picker
+     follows="left|top|right"
+     height="197"
+     width="290"
+     layout="topleft"
+     top="20"
+     left="10"
+     name="classified_snapshot" />
+          <icon
+           height="18"
+           image_name="AddItem_Off"
+           layout="topleft"
+           right="-5"
+           name="edit_icon"
+           label=""
+           tool_tip="Click to select an image"
+           top="27"
+           width="18" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="15"
+         font="SansSerifSmall"
+         font.style="BOLD"
+         layout="topleft"
+         left="10"
+         top="215"
+         name="Name:"
+         text_color="white"
+         width="290">
+            Title:
+        </text>
+        <line_editor
+         follows="left|top|right"
+         font="SansSerif"
+         height="20"
+         layout="topleft"
+         left="10"
+         top_pad="2"
+         max_length="63"
+         name="classified_name"
+         text_color="black"
+         width="290" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="15"
+         font="SansSerifSmall"
+         font.style="BOLD"
+         layout="topleft"
+         left="10"
+         top_pad="20"
+         name="description_label"
+         text_color="white"
+         width="290">
+            Description:
+        </text>
+        <text_editor
+         follows="left|top|right"
+         height="100"
+         width="290"
+         hide_scrollbar="false"
+         layout="topleft"
+         left="10"
+         top_pad="2"
+         max_length="1023"
+         name="classified_desc"
+         text_color="black"
+         word_wrap="true" />
+        <text
+         type="string"
+         length="1"
+         font="SansSerifSmall"
+         font.style="BOLD"
+         follows="left|top"
+         height="15"
+         layout="topleft"
+         left="10"
+         name="location_label"
+         text_color="white"
+         top_pad="20"
+         width="290">
+            Location:
+        </text>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="50"
+         layout="topleft"
+         left="10"
+         name="classified_location"
+         right="-10"
+         top_pad="2"
+         width="290"
+         word_wrap="true">
+            loading...
+        </text>
+        <button
+         follows="left|top"
+         height="20"
+         label="Set to Current Location"
+         layout="topleft"
+         left="8"
+         top_pad="5"
+         name="set_to_curr_location_btn"
+         width="200" />
+        <combo_box
+         follows="left|top" 
+         height="18" 
+         label=""
+	     left="10" 
+         name="category" 
+         top_pad="5"
+         width="200" />
+        <combo_box 
+         allow_text_entry="false" 
+         follows="left|top" 
+         height="18" 
+         left="10"
+         name="content_type" 
+         top_pad="5"
+         width="200">
+         <combo_item 
+          name="mature_ci" 
+          value="Mature">
+           Mature Content
+         </combo_item>
+         <combo_item 
+          name="pg_ci" 
+          value="PG">
+           PG Content
+         </combo_item>
+        </combo_box>
+        <spinner
+         decimal_digits="0"
+         follows="left|top"
+         halign="left"
+         height="16"
+         increment="1"
+         label_width="20"
+         label="L$"
+         layout="topleft"
+         left="10"
+         value="50"
+         min_val="50"
+         max_val="99999"
+         name="price_for_listing"
+         top_pad="5"
+         tool_tip="Price for listing."
+         width="105" />
+        <check_box
+         height="16"
+         label="Auto renew each week"
+         layout="topleft"
+         left="10"
+         name="auto_renew"
+         top_pad="5"
+         width="250" />
+    </panel>
+    </scroll_container>
+    <panel
+     follows="left|right|bottom"
+     height="20"
+     label="bottom_panel"
+     layout="topleft"
+     left="10"
+     name="bottom_panel"
+     top_pad="5"
+     width="303">
+        <button
+         follows="bottom|left"
+         height="19"
+         label="Save"
+         layout="topleft"
+         name="save_changes_btn"
+         left="0"
+         top="0"
+         width="130" />
+        <button
+         follows="bottom|left"
+         height="19"
+         label="Cancel"
+         layout="topleft"
+         name="cancel_btn"
+         left_pad="5"
+         right="-1"
+         width="130" />
+    </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index f4a212ba0a..d6de5af32d 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -53,7 +53,7 @@
      layout="topleft"
      top="0"
      background_visible="false"
-     height="470"
+     height="510"
      left="0"
      width="295">
     <texture_picker
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 0c24adfad5..b01ddbf75a 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -43,6 +43,16 @@
      name="acquired_date">
         [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
     </string>
+    <!-- Texture names for rating icons -->
+    <string
+     name="icon_PG"
+     value="parcel_drk_PG" />
+    <string
+     name="icon_M"
+     value="parcel_drk_M" />
+    <string
+     name="icon_R"
+     value="parcel_drk_R" />
     <button
      follows="top|right"
      height="23"
@@ -125,6 +135,24 @@
              top_pad="10"
              value="Du waltz die spritz"
              width="300" />
+            <icon
+             follows="top|left"
+             height="16"
+             image_name="unknown"
+             layout="topleft"
+             left="10"
+             name="maturity_icon"
+             top_pad="10"
+             width="18" />
+            <text
+             follows="right|top"
+             height="16"
+             layout="topleft"
+             left_pad="8"
+             name="maturity_value"
+             top_delta="0"
+             value="unknown"
+             width="268" />
             <panel
              follows="left|top|right"
              height="55"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index ae61852f68..dbe76e553b 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -8,16 +8,57 @@
  name="panel_picks"
  top="0"
  width="313">
+ <string
+  name="no_picks"
+  value="No Picks" />
+ <string
+  name="no_classifieds"
+  value="No Classifieds" />
+     
+ <accordion
+  follows="all"
+  height="465"
+  layout="topleft"
+  left="0"
+  name="accordion"
+  top="0"
+  width="313">
+    <accordion_tab
+     can_resize="false"
+     layout="topleft"
+     height="235"
+     min_height="150"
+     name="tab_picks"
+     title="Picks"
+     visible="false">
  <flat_list_view
          color="DkGray2"
          follows="all"
-         height="465"
          layout="topleft"
          left="0"
          name="picks_list"
          opaque="true"
          top="0"
          width="313" />
+    </accordion_tab>
+    <accordion_tab
+     can_resize="false"
+     layout="topleft"
+     height="235"
+     name="tab_classifieds"
+     title="Classified"
+     visible="false">
+            <flat_list_view
+             color="DkGray2"
+             follows="all"
+             layout="topleft"
+             left="0"
+             name="classifieds_list"
+             opaque="true"
+             top="0"
+             width="313" />
+    </accordion_tab>
+ </accordion>
    <panel
          background_visible="true"
          bevel_style="none"
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 65f150b33c..e6084202d7 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -179,7 +179,6 @@
          min_height="300"
          name="scrolling_panel"
          top="0"
-         value="&gt;"
          width="313">
             <texture_picker
              enabled="false"
@@ -296,6 +295,24 @@
              top_delta="0"
              value="Alex Superduperlongenamenton"
              width="205" />
+            <icon
+             follows="top|left"
+             height="16"
+             image_name="unknown"
+             layout="topleft"
+             left="10"
+             name="maturity_icon"
+             top_delta="0"
+             width="18" />
+            <text
+             follows="right|top"
+             height="16"
+             layout="topleft"
+             left_pad="8"
+             name="maturity_value"
+             top_delta="0"
+             value="unknown"
+             width="268" />
             <accordion
              follows="all"
              height="230"
@@ -308,222 +325,211 @@
                  layout="topleft"
                  name="parcel_characteristics_tab"
                  title="Parcel">
-                    <scroll_container
-                     color="DkGray2"
+                    <panel
                      follows="all"
-                     height="132"
+                     height="160"
                      layout="topleft"
                      left="0"
-                     name="parcel_scroll"
-                     opaque="true"
                      top="0"
-                     width="290">
-                        <panel
-                         follows="all"
-                         height="165"
+                     width="275">
+                        <icon
+                         follows="top|left"
+                         height="16"
+                         image_name="parcel_drk_PG"
                          layout="topleft"
-                         left="0"
+                         left="10"
+                         name="rating_icon"
                          top="0"
-                         width="275">
-                            <icon
-                             follows="top|left"
-                             height="16"
-                             image_name="parcel_drk_PG"
-                             layout="topleft"
-                             left="20"
-                             name="rating_icon"
-                             top="0"
-                             width="18" />
-                            <text
-                             follows="left|top"
-                             height="16"
-                             layout="topleft"
-                             left_pad="8"
-                             name="rating_label"
-                             value="Rating:"
-                             width="80" />
-                            <text
-                             follows="right|top"
-                             height="16"
-                             layout="topleft"
-                             left_pad="0"
-                             name="rating_value"
-                             top_delta="0"
-                             value="unknown"
-                             width="120" />
-                            <icon
-                             follows="top|left"
-                             height="18"
-                             image_name="parcel_drk_Voice"
-                             layout="topleft"
-                             left="20"
-                             name="voice_icon"
-                             top_pad="5"
-                             width="22" />
-                            <text
-                             follows="left|top"
-                             height="18"
-                             layout="topleft"
-                             left_pad="8"
-                             name="voice_label"
-                             top_delta="0"
-                             value="Voice:"
-                             width="76" />
-                            <text
-                             follows="right|top"
-                             height="18"
-                             layout="topleft"
-                             left_pad="0"
-                             name="voice_value"
-                             top_delta="0"
-                             value="On"
-                             width="60" />
-                            <icon
-                             follows="top|left"
-                             height="18"
-                             image_name="parcel_drk_Fly"
-                             layout="topleft"
-                             left="20"
-                             name="fly_icon"
-                             top_pad="3"
-                             width="22" />
-                            <text
-                             follows="left|top"
-                             height="16"
-                             layout="topleft"
-                             left_pad="8"
-                             name="fly_label"
-                             value="Fly:"
-                             width="76" />
-                            <text
-                             follows="right|top"
-                             height="16"
-                             layout="topleft"
-                             left_pad="0"
-                             name="fly_value"
-                             top_delta="0"
-                             value="On"
-                             width="60" />
-                            <icon
-                             follows="top|left"
-                             height="18"
-                             image_name="parcel_drk_Push"
-                             layout="topleft"
-                             left="20"
-                             name="push_icon"
-                             top_pad="3"
-                             width="22" />
-                            <text
-                             follows="left|top"
-                             height="14"
-                             layout="topleft"
-                             left_pad="8"
-                             name="push_label"
-                             value="Push:"
-                             width="76" />
-                            <text
-                             follows="right|top"
-                             height="14"
-                             layout="topleft"
-                             left_pad="0"
-                             name="push_value"
-                             top_delta="0"
-                             value="Off"
-                             width="60" />
-                            <icon
-                             follows="top|left"
-                             height="18"
-                             image_name="parcel_drk_Build"
-                             layout="topleft"
-                             left="20"
-                             name="build_icon"
-                             top_pad="3"
-                             width="22" />
-                            <text
-                             follows="left|top"
-                             height="14"
-                             layout="topleft"
-                             left_pad="8"
-                             name="build_label"
-                             value="Build:"
-                             width="76" />
-                            <text
-                             follows="right|top"
-                             height="15"
-                             layout="topleft"
-                             left_pad="0"
-                             name="build_value"
-                             top_delta="0"
-                             value="On"
-                             width="60" />
-                            <icon
-                             follows="top|left"
-                             height="18"
-                             image_name="parcel_drk_Scripts"
-                             layout="topleft"
-                             left="20"
-                             name="scripts_icon"
-                             top_pad="3"
-                             width="22" />
-                            <text
-                             follows="left|top"
-                             height="14"
-                             layout="topleft"
-                             left_pad="8"
-                             name="scripts_label"
-                             value="Scripts:"
-                             width="76" />
-                            <text
-                             follows="right|top"
-                             height="14"
-                             layout="topleft"
-                             left_pad="0"
-                             name="scripts_value"
-                             top_delta="0"
-                             value="On"
-                             width="60" />
-                            <icon
-                             follows="top|left"
-                             height="18"
-                             image_name="parcel_drk_Damage"
-                             layout="topleft"
-                             left="20"
-                             name="damage_icon"
-                             top_pad="7"
-                             width="22" />
-                            <text
-                             follows="left|top"
-                             height="14"
-                             layout="topleft"
-                             left_pad="8"
-                             name="damage_label"
-                             value="Damage:"
-                             width="76" />
-                            <text
-                             follows="right|top"
-                             height="14"
-                             layout="topleft"
-                             left_pad="0"
-                             name="damage_value"
-                             top_delta="0"
-                             value="Off"
-                             width="60" />
-                            <button
-                             follows="bottom|right"
-                             height="19"
-                             label="About Land"
-                             layout="topleft"
-                             name="about_land_btn"
-                             right="-5"
-                             tab_stop="false"
-                             top="138"
-                             width="90">
-                                <click_callback
-                                 function="ShowFloater"
-                                 parameter="about_land" />
-                            </button>
-                        </panel>
-                    </scroll_container>
+                         width="18" />
+                        <text
+                         follows="left|top"
+                         height="16"
+                         layout="topleft"
+                         left_pad="12"
+                         name="rating_label"
+                         value="Rating:"
+                         width="60" />
+                        <text
+                         follows="left|right|top"
+                         height="16"
+                         layout="topleft"
+                         left_pad="0"
+                         name="rating_value"
+                         top_delta="0"
+                         value="unknown"
+                         width="60" />
+                        <icon
+                         follows="top|left"
+                         height="18"
+                         image_name="parcel_drk_Voice"
+                         layout="topleft"
+                         left="10"
+                         name="voice_icon"
+                         top_pad="5"
+                         width="22" />
+                        <text
+                         follows="left|top"
+                         height="18"
+                         layout="topleft"
+                         left_pad="8"
+                         name="voice_label"
+                         top_delta="0"
+                         value="Voice:"
+                         width="60" />
+                        <text
+                         follows="left|right|top"
+                         height="18"
+                         layout="topleft"
+                         left_pad="0"
+                         name="voice_value"
+                         top_delta="0"
+                         value="On"
+                         width="60" />
+                        <icon
+                         follows="top|left"
+                         height="18"
+                         image_name="parcel_drk_Fly"
+                         layout="topleft"
+                         left="10"
+                         name="fly_icon"
+                         top_pad="3"
+                         width="22" />
+                        <text
+                         follows="left|top"
+                         height="16"
+                         layout="topleft"
+                         left_pad="8"
+                         name="fly_label"
+                         value="Fly:"
+                         width="60" />
+                        <text
+                         follows="left|right|top"
+                         height="16"
+                         layout="topleft"
+                         left_pad="0"
+                         name="fly_value"
+                         top_delta="0"
+                         value="On"
+                         width="60" />
+                        <icon
+                         follows="top|left"
+                         height="18"
+                         image_name="parcel_drk_Push"
+                         layout="topleft"
+                         left="10"
+                         name="push_icon"
+                         top_pad="3"
+                         width="22" />
+                        <text
+                         follows="left|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="8"
+                         name="push_label"
+                         value="Push:"
+                         width="60" />
+                        <text
+                         follows="left|right|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="0"
+                         name="push_value"
+                         top_delta="0"
+                         value="Off"
+                         width="60" />
+                        <icon
+                         follows="top|left"
+                         height="18"
+                         image_name="parcel_drk_Build"
+                         layout="topleft"
+                         left="10"
+                         name="build_icon"
+                         top_pad="3"
+                         width="22" />
+                        <text
+                         follows="left|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="8"
+                         name="build_label"
+                         value="Build:"
+                         width="60" />
+                        <text
+                         follows="left|right|top"
+                         height="15"
+                         layout="topleft"
+                         left_pad="0"
+                         name="build_value"
+                         top_delta="0"
+                         value="On"
+                         width="60" />
+                        <icon
+                         follows="top|left"
+                         height="18"
+                         image_name="parcel_drk_Scripts"
+                         layout="topleft"
+                         left="10"
+                         name="scripts_icon"
+                         top_pad="3"
+                         width="22" />
+                        <text
+                         follows="left|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="8"
+                         name="scripts_label"
+                         value="Scripts:"
+                         width="60" />
+                        <text
+                         follows="left|right|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="0"
+                         name="scripts_value"
+                         top_delta="0"
+                         value="On"
+                         width="60" />
+                        <icon
+                         follows="top|left"
+                         height="18"
+                         image_name="parcel_drk_Damage"
+                         layout="topleft"
+                         left="10"
+                         name="damage_icon"
+                         top_pad="7"
+                         width="22" />
+                        <text
+                         follows="left|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="8"
+                         name="damage_label"
+                         value="Damage:"
+                         width="60" />
+                        <text
+                         follows="left|right|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="0"
+                         name="damage_value"
+                         top_delta="0"
+                         value="Off"
+                         width="60" />
+                        <button
+                         follows="bottom|right"
+                         height="19"
+                         label="About Land"
+                         layout="topleft"
+                         name="about_land_btn"
+                         right="-5"
+                         tab_stop="false"
+                         top="138"
+                         width="90">
+                            <click_callback
+                             function="ShowFloater"
+                             parameter="about_land" />
+                        </button>
+                    </panel>
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
@@ -545,7 +551,7 @@
                          name="region_name_label"
                          top_pad="5"
                          value="Region:"
-                         width="80" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
@@ -554,7 +560,7 @@
                          name="region_name"
                          top_delta="0"
                          value="Mooseland"
-                         width="195" />
+                         width="187" />
                         <text
                          follows="left|top"
                          height="15"
@@ -563,7 +569,7 @@
                          name="region_type_label"
                          top_pad="5"
                          value="Type:"
-                         width="80" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
@@ -572,7 +578,7 @@
                          name="region_type"
                          top_delta="0"
                          value="Moose"
-                         width="195" />
+                         width="187" />
                         <text
                          follows="left|top"
                          height="15"
@@ -581,7 +587,7 @@
                          name="region_rating_label"
                          top_pad="7"
                          value="Rating:"
-                         width="80" />
+                         width="90" />
                         <icon
                          follows="top|left"
                          height="16"
@@ -597,7 +603,7 @@
                          left_pad="10"
                          name="region_rating"
                          value="Explicit"
-                         width="100" />
+                         width="159" />
                         <text
                          follows="left|top"
                          height="15"
@@ -606,7 +612,7 @@
                          name="region_owner_label"
                          top_pad="5"
                          value="Owner:"
-                         width="80" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
@@ -615,7 +621,7 @@
                          name="region_owner"
                          top_delta="0"
                          value="moose Van Moose"
-                         width="195" />
+                         width="187" />
                         <text
                          follows="left|top"
                          height="15"
@@ -624,7 +630,7 @@
                          name="region_group_label"
                          top_pad="5"
                          value="Group:"
-                         width="80" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
@@ -633,7 +639,7 @@
                          name="region_group"
                          top_delta="0"
                          use_ellipses="true"
-                         width="195">
+                         width="187">
                             The Mighty Moose of mooseville soundvillemoose
                         </text>
                         <button
@@ -671,15 +677,15 @@
                          name="estate_name_label"
                          top_pad="5"
                          value="Estate:"
-                         width="80" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left="90"
+                         left_pad="0"
                          name="estate_name"
                          top_delta="0"
-                         width="160" />
+                         width="187" />
                         <text
                          follows="left|top"
                          height="15"
@@ -688,15 +694,15 @@
                          name="estate_rating_label"
                          top_pad="5"
                          value="Rating:"
-                         width="80" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left="90"
+                         left_pad="0"
                          name="estate_rating"
                          top_delta="0"
-                         width="160" />
+                         width="187" />
                         <text
                          follows="left|top"
                          height="15"
@@ -705,15 +711,15 @@
                          name="estate_owner_label"
                          top_pad="5"
                          value="Owner:"
-                         width="80" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left="90"
+                         left_pad="0"
                          name="estate_owner"
                          top_delta="0"
-                         width="160" />
+                         width="187" />
                         <text
                          follows="left|top"
                          height="15"
@@ -722,7 +728,7 @@
                          name="covenant_label"
                          top_pad="5"
                          value="Covenant:"
-                         width="220" />
+                         width="277" />
                         <text_editor
                          bg_focus_color="DkGray2"
                          bg_readonly_color="DkGray2"
@@ -735,7 +741,8 @@
                          name="covenant"
                          read_only="true"
                          top_pad="0"
-                         width="280" />
+                         width="277"
+                         word_wrap="true" />
                     </panel>
                 </accordion_tab>
                 <accordion_tab
@@ -758,15 +765,15 @@
                          name="sales_price_label"
                          top_pad="5"
                          value="Price:"
-                         width="100" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left="110"
+                         left_pad="0"
                          name="sales_price"
                          top_delta="0"
-                         width="140" />
+                         width="187" />
                         <text
                          follows="left|top"
                          height="15"
@@ -775,15 +782,15 @@
                          name="area_label"
                          top_pad="5"
                          value="Area:"
-                         width="100" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left="110"
+                         left_pad="0"
                          name="area"
                          top_delta="0"
-                         width="140" />
+                         width="187" />
                         <text
                          follows="left|top"
                          height="15"
@@ -792,15 +799,15 @@
                          name="traffic_label"
                          top_pad="5"
                          value="Traffic:"
-                         width="100" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left="110"
+                         left_pad="0"
                          name="traffic"
                          top_delta="0"
-                         width="140" />
+                         width="187" />
                         <text
                          follows="left|top"
                          height="15"
@@ -809,15 +816,15 @@
                          name="primitives_label"
                          top_pad="5"
                          value="Primitives:"
-                         width="100" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left="110"
+                         left_pad="0"
                          name="primitives"
                          top_delta="0"
-                         width="140" />
+                         width="187" />
                         <text
                          follows="left|top"
                          height="15"
@@ -826,15 +833,15 @@
                          name="parcel_scripts_label"
                          top_pad="5"
                          value="Scripts:"
-                         width="100" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left="110"
+                         left_pad="0"
                          name="parcel_scripts"
                          top_delta="0"
-                         width="140" />
+                         width="187" />
                         <text
                          follows="left|top"
                          height="15"
@@ -843,15 +850,15 @@
                          name="terraform_limits_label"
                          top_pad="5"
                          value="Terraform limits:"
-                         width="100" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left="110"
+                         left_pad="0"
                          name="terraform_limits"
                          top_delta="0"
-                         width="140" />
+                         width="187" />
                         <text
                          follows="left|top"
                          height="15"
@@ -860,7 +867,7 @@
                          name="subdivide_label"
                          top_pad="5"
                          value="Subdivide/Join ability:"
-                         width="220" />
+                         width="277" />
                         <text_editor
                          bg_focus_color="DkGray2"
                          bg_readonly_color="DkGray2"
@@ -872,7 +879,8 @@
                          name="subdivide"
                          read_only="true"
                          top_pad="5"
-                         width="245" />
+                         width="277"
+                         word_wrap="true" />
                         <text
                          follows="left|top"
                          height="15"
@@ -881,7 +889,7 @@
                          name="resale_label"
                          top_pad="5"
                          value="ReSale ability:"
-                         width="80" />
+                         width="277" />
                         <text_editor
                          bg_focus_color="DkGray2"
                          bg_readonly_color="DkGray2"
@@ -893,7 +901,8 @@
                          name="resale"
                          read_only="true"
                          top_pad="5"
-                         width="245" />
+                         width="277"
+                         word_wrap="true" />
                         <text
                          follows="left|top"
                          height="15"
@@ -902,15 +911,15 @@
                          name="sale_to_label"
                          top_pad="5"
                          value="For sale to:"
-                         width="80" />
+                         width="90" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left="90"
+                         left_pad="0"
                          name="sale_to"
                          top_delta="0"
-                         width="160" />
+                         width="187" />
                     </panel>
                 </accordion_tab>
             </accordion>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index cbbcfe5068..5efacb68be 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -104,7 +104,7 @@ background_visible="true"
          follows="bottom|right"
          font="SansSerifSmall"
          height="19"
-         image_disabled="ForwardArrow_Disabled"
+         image_disabled="ForwardArrow_Off"
          image_selected="ForwardArrow_Press"
          image_unselected="ForwardArrow_Off"
          layout="topleft"
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 b1308a1942..9b10edde33 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -109,19 +109,7 @@
      name="ui_scale_slider"
      top_pad="2"
      width="180" />
-    <spinner
-     control_name="UIScaleFactor"
-     height="16"
-     increment="0.025"
-     initial_value="1"
-     layout="topleft"
-     left_pad="10"
-     max_val="1.4"
-     min_val="0.75"
-     name="ui_scale_slider"
-     top_delta="0"
-     width="58" />
-     <text
+    <text
      type="string"
      length="1"
      follows="left|top"