Merge

20 files changed, 334 insertions, 226 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index c617dacec5..d45d6155dd 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -344,7 +344,7 @@
      value="0.92 0.92 1 0.78" />
     <color
      name="GridlineColor"
-     reference="Red" />
+     reference="White" />
     <color
      name="GridlineShadowColor"
      value="0 0 0 0.31" />
@@ -359,7 +359,7 @@
      reference="White"/>
     <color
      name="GroupNotifyDimmedTextColor"
-     reference="LtGray" />
+     reference="DkGray" />
     <color
      name="GroupOverTierColor"
      value="0.43 0.06 0.06 1" />
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..29c6ae8009 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -46,7 +46,7 @@
          top="0">
             <panel.string
              name="new users only">
-                New users only
+                New Residents only
             </panel.string>
             <panel.string
              name="anyone">
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_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_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_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 1ab3dda52c..01548dd820 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -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
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 936f4a3fab..4264b86a72 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -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 903a9689f1..a8c72e03bd 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -51,11 +51,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 +63,18 @@
      layout="topleft"
      top="0"
      background_visible="false"
-     height="500"
+     height="610"
      left="0"
      width="285">
         <texture_picker
          enabled="false"
          follows="left|top|right"
          height="197"
+         width="272"
          layout="topleft"
          left="11"
          name="classified_snapshot"
-         top="10"
-         width="286" />
+         top="10" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -93,6 +93,17 @@
          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="10"
+         value="Location:"
+         width="250" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -103,10 +114,22 @@
          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="250" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -118,9 +141,20 @@
          name="content_type"
          read_only="true"
          width="290"
-         top_pad="5"
+         top_pad="15"
          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="10"
+         value="Category:"
+         width="250" />
         <text_editor
          allow_html="true"
          allow_scroll="false"
@@ -136,6 +170,17 @@
          top_pad="5"
          v_pad="0"
          value="[category]" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="price_for_listing_label"
+         text_color="white"
+         top_pad="10"
+         value="Price for listing:"
+         width="250" />
         <text_editor
          allow_scroll="false"
          bg_visible="false"
@@ -150,33 +195,80 @@
          top_pad="5"
          tool_tip="Price for listing."
          v_pad="0"
+         value="[price]"
          width="105" />
+        <layout_stack
+         animate="false"
+         name="descr_stack"
+         layout="topleft"
+         follows="top|left"
+         orientation="vertical"
+         left="10"
+         top_pad="5"
+         width="290"
+         height="250">
+         <layout_panel
+          auto_resize="false"
+          name="price_layout_panel"
+          layout="topleft"
+          follows="top|left"
+          left="0"
+          top="0"
+          width="290"
+          height="26"
+          user_resize="false">
         <check_box
          enabled="false"
          height="16"
          label="Auto renew each week"
          layout="topleft"
-         left="10"
+         follows="top|left"
+         left="0"
          name="auto_renew"
-         top_pad="5"
+         top="0"
          v_pad="0"
          width="290" />
+         </layout_panel>
+         <layout_panel
+          name="descr_layout_panel"
+          layout="topleft"
+          follows="top|left"
+          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="false"
+         allow_scroll="true"
          bg_visible="false"
          follows="left|top|right"
          h_pad="0"
          height="200"
          layout="topleft"
-         left="10"
+         left="0"
          max_length="1023"
          name="classified_desc"
          read_only="true"
+         top_pad="5"
          width="290"
          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_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index 66d5389d9b..6cc6c51fe0 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -42,16 +42,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,17 +59,17 @@
      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" />
+      <texture_picker
+       follows="left|top|right"
+       height="197"
+       width="272"
+       layout="topleft"
+       top="10"
+       left="11"
+       name="classified_snapshot" />
           <icon
            height="197"
            image_name="spacer24.tga"
@@ -153,7 +153,7 @@
          type="string"
          length="1"
          follows="left|top"
-         height="50"
+         height="30"
          layout="topleft"
          left="10"
          name="classified_location"
@@ -172,6 +172,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,6 +191,17 @@
          name="category" 
          top_pad="5"
          width="156" />
+        <text
+         follows="left|top"
+         font.style="BOLD"
+         height="10"
+         layout="topleft"
+         left="10"
+         name="content_type_label"
+         text_color="white"
+         top_pad="15"
+         value="Content type:"
+         width="250" />
         <combo_box 
          allow_text_entry="false" 
          follows="left|top" 
@@ -199,6 +221,17 @@
            General Content
          </combo_item>
         </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 +256,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"
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..5147bb72d0 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
@@ -100,17 +100,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 +112,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 +128,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 +145,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 +161,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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 540e17e413..0c57b99b68 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -222,7 +222,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>
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 d336e18011..3913b6d709 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -59,7 +59,7 @@
      left_delta="0"
      name="owner_text"
      top_pad="2"
-     width="180">
+     width="80">
         Estate owner:
     </text>
     <text
@@ -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..1bbe9d80c0 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -205,7 +205,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 +214,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/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index d2c9e56bc3..6588663bac 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -549,5 +549,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/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