merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3

16 files changed, 278 insertions, 220 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 179c790aed..d55f9fa42f 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -304,7 +304,10 @@
      value="0.3344 0.5456 0.5159 1" />
     <color
      name="GroupNotifyTextColor"
-     value="0 0.12 0.24 1" />
+	 reference="White"/>
+    <color
+     name="GroupNotifyDimmedTextColor"
+	 reference="DkGray"/>	 
     <color
      name="GroupOverTierColor"
      value="0.43 0.06 0.06 1" />
@@ -493,10 +496,10 @@
      value="1 0.82 0.46 1" />
     <color
      name="NotifyCautionWarnColor"
-     reference="Black" />
+     reference="White" />
     <color
      name="NotifyTextColor"
-     reference="Black" />
+     reference="White" />
     <color
      name="ObjectChatColor"
      reference="LtGray" />
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 3052571b1e..2d67e3d5a9 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -28,5 +28,21 @@
       		color="1 1 1 1" enabled="true" image_name="closebox.tga"
       		name="close_btn"/>
 	</panel>
-  <chat_items_container bottom="0" width="250" height="320" follows="left|right|top|bottom" name="chat_history" />
+            <text_editor
+             bg_readonly_color="ChatHistoryBgColor"
+             bg_writeable_color="ChatHistoryBgColor"
+             follows="left|top|right|bottom"
+             font="SansSerif"
+             layout="topleft"
+			 height="320"
+             max_length="2147483647"
+             name="Chat History Editor"
+             read_only="true"
+             text_color="ChatHistoryTextColor"
+             text_readonly_color="ChatHistoryTextColor"
+             bottom="0"
+             track_bottom="true"
+             width="250"
+             word_wrap="true" />
+
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml
index 78dff0bd4a..013136a593 100644
--- a/indra/newview/skins/default/xui/en/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_navbar.xml
@@ -23,6 +23,9 @@
         <menu_item_call.on_click
          function="Navbar.Action"
          parameter="landmark" />
+        <menu_item_call.on_enable
+         function="Navbar.EnableMenuItem"
+         parameter="can_landmark" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e922e3b743..fe1baf22d0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -181,22 +181,10 @@
              function="World.Chat" />
         </menu_item_call>
         <menu_item_check
-         label="Local Chat"
-         layout="topleft"
-         name="Chat History"
-         shortcut="control|H">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="chat" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="chat" />
-        </menu_item_check>
-        <menu_item_check
          label="Nearby Chat"
          layout="topleft"
          name="Nearby Chat"
-         shortcut="control|N">
+         shortcut="control|H">
             <menu_item_check.on_check
              function="Floater.Visible"
              parameter="nearby_chat" />
@@ -204,29 +192,6 @@
              function="Floater.Toggle"
              parameter="nearby_chat" />
         </menu_item_check>
-        <menu_item_check
-         label="Communicate"
-         layout="topleft"
-         name="Instant Message"
-         shortcut="control|T">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="communicate" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="communicate" />
-        </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
-		<menu_item_call
-         label="Media Remote Ctrl"
-         layout="topleft"
-         name="Preferences"
-         shortcut="control|alt|M">
-            <menu_item_call.on_click
-             function="Floater.Toggle"
-             parameter="media_remote_ctrl" />
-        </menu_item_call>
         <menu_item_separator
          layout="topleft" />
         <menu_item_check
@@ -251,6 +216,29 @@
              function="Floater.Toggle"
              parameter="mute" />
         </menu_item_check>
+        <menu_item_separator
+         layout="topleft" />
+        <menu_item_check
+         label="(Legacy) Communicate"
+         layout="topleft"
+         name="Instant Message"
+         shortcut="control|T">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="communicate" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="communicate" />
+        </menu_item_check>
+		<menu_item_call
+         label="(Temp) Media Remote Ctrl"
+         layout="topleft"
+         name="Preferences"
+         shortcut="control|alt|M">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="media_remote_ctrl" />
+        </menu_item_call>
     </menu>
     <menu
      label="World"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c89eed37ab..17bb961308 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4191,6 +4191,7 @@ Are you sure you want to quit?
      name="okcancelignore"
      notext="Don&apos;t Quit"
      yestext="Quit"/>
+     <unique/>
   </notification>
 
   <notification
@@ -6465,6 +6466,10 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block
      yestext="Create group for L$100"/>
   </notification>
 
+  <notification icon="notifytip.tga"
+		name="AttachmentSaved" type="notifytip">
+		Attachment has been saved.
+  </notification>
 
   <global name="UnsupportedCPU">
 - Your CPU speed does not meet the minimum requirements.
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index bbef5a8892..d42943d225 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -39,105 +39,12 @@
          layout="topleft"
          left="5"
          min_height="28"
-         width="250"
+         width="500"
          top="0"
-         min_width="100">
-            <line_editor
-             border_style="line"
-             border_thickness="1"
-             follows="left|right"
-             height="20"
-             layout="topleft"
-             left="0"
-             name="chat_box"
-             right="-39"
-             top="3"
-             width="250" />
-            <button follows="right" width="36" top="3" left="214" resize="false"
-               label="Hx" height="20">
-              <button.commit_callback function="Floater.Toggle" parameter="chat"/>
-          </button>
-        </layout_panel>
-        <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         top="0"
-         width="5"
-         min_width="5" />
-        <view_border
-         auto_resize="false"
-         bevel_style="in"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         left="270"
-         top="0"
-         width="1" />
-        <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         top="0"
-         width="5" 
-         min_width="5" />
-        <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="100"
-         top="0"
-         min_width="100">
-            <chiclet_talk
-             follows="right"
-             height="20"
-             layout="topleft"
-             left="0"
-             name="talk"
-             top="3"
-             width="100" />
-        </layout_panel>
-        <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         name="DUMMY"
-         top="0"
-         width="5" 
-         min_width="5"/>
-        <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="90"
-         top="0"
-         min_width="90">
-            <gesture_combo_box
-             bottom="22"
-             follows="right"
-             height="20"
-             label="Gestures"
-             layout="topleft"
-             name="Gesture"
-             top="3"
-             width="90" />
-        </layout_panel>
+         min_width="305"
+         name="chat_bar"
+         user_resize="false"
+         filename="panel_nearby_chat_bar.xml"/>
 		 <icon
          auto_resize="false"
          color="0 0 0 0"
@@ -159,7 +66,8 @@
          min_height="28"
          width="90"
          top_delta="-10"
-         min_width="90">
+         min_width="90"
+         user_resize="false">
             <button
              bottom="22"
              follows="right"
@@ -190,7 +98,7 @@
          top="0"
          name="chiclet_list_panel"
          width="150"
-         min_width="70">
+         user_resize="false">
             <chiclet_panel
              follows="left|right"
              height="25"
@@ -222,14 +130,15 @@
          name="im_well_panel"
          width="40"
          top="0"
-         min_width="40" >
+         min_width="40" 
+         user_resize="false">
             <chiclet_notification
              follows="right"
              height="25"
              layout="topleft"
              left="0"
              name="im_well"
-             top="1"
+             top="2"
              width="40">
               <button
                image_selected="im_notifications.tga"
@@ -285,14 +194,15 @@
          top="0"
          name="sys_well_panel"
          width="48"
-         min_width="48">
+         min_width="48"
+         user_resize="false">
             <chiclet_notification
              follows="right"
              height="25"
              layout="topleft"
              left="0"
              name="sys_well"
-             top="1"
+             top="2"
              width="48">
               <button
                image_selected="bottom_tray_sys_notifications.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
index b628ee3aa1..713c3a41a2 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -15,7 +15,7 @@
       		color="1 1 1 1" enabled="true" name="avatar_icon"
 		  />
     	<text
-        	width="160" top="25" left="40" height="20" follows="left|right|top"
+        	width="130" top="25" left="40" height="20" follows="left|right|top"
         	font="SansSerifBigBold" text_color="white" word_wrap="true"
         	mouse_opaque="true" name="sender_name" >
 	      Jerry Knight
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index 1757197372..a39a681f83 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -9,21 +9,23 @@
 			top="5"  left="5" mouse_opaque="true" name="group_icon"/>
 		<text type="string" length="1" follows="left|top|right|bottom"
 			font="SansSerifBigBold" height="20" layout="topleft" left="60" name="title"
-			text_color="white" top="20" width="300">
+			text_color="GroupNotifyTextColor" top="20" width="300">
 			Sender Name / Group Name
         </text>
 	</panel>
 	<text_editor type="string" length="1" bg_readonly_color="0 0 0 0"
 		follows="left|top|right|bottom" height="70" hide_scrollbar="true"
 		hide_border="true" layout="topleft" top="55" left="25" name="message"
-		text_color="white" text_readonly_color="white" width="300" word_wrap="true">
+		text_color="GroupNotifyTextColor" text_readonly_color="GroupNotifyTextColor" width="300" word_wrap="true">
 		Message
 		Body
     </text_editor>
+	<icon follows="left|top|right|bottom" height="16" width="16"
+		layout="topleft" top="135" left="25" mouse_opaque="true" name="attachment_icon" />
 	<text font="SansSerif" font.style="UNDERLINE" font_shadow="hard"
 		type="string" length="1" follows="left|top|right|bottom" layout="topleft"
-		left="25" top="135" height="15" width="300" name="attachment"
-		text_color="white">
+		left="45" top="135" height="15" width="280" name="attachment"
+		text_color="GroupNotifyTextColor">
 		Attachment
         </text>
 	<button label="OK" layout="topleft" top="170" left="140" height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
new file mode 100644
index 0000000000..8b19f9a515
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ default_tab_group="1"
+ follows="left|bottom|right"
+ height="25"
+ layout="topleft"
+ left="0"
+ name="chat_bar"
+ top="24"
+ width="500">
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|right"
+     height="20"
+     label="Click here to chat."
+     layout="topleft"
+     left_delta="7"
+     left="0"
+     name="chat_box"
+     tool_tip="Press Enter to say, Ctrl-Enter to shout."
+     top="3"
+     width="250" />
+    <button 
+	   follows="right" 
+	   width="45" 
+	   top="3" 
+	   layout="topleft" 
+	   left_pad="5"
+       label="Log" 
+	   height="20">
+      <button.commit_callback function="Floater.Toggle" parameter="nearby_chat"/>
+    </button>
+    <chiclet_talk
+     follows="right"
+     height="20"
+     layout="topleft"
+     left_pad="5"
+     name="talk"
+     top="3"
+     width="100" />
+    <gesture_combo_box
+     follows="right"
+     height="20"
+     label="Gestures"
+     layout="topleft"
+     name="Gesture"
+     left_pad="5"
+     top="3"
+     width="90" />
+</panel>
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 686dc931d3..1a06e2bb06 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
@@ -9,7 +9,7 @@
  left="0"
  name="picture_item"
  top="80"
- width="310">
+ width="245">
     <texture_picker
      allow_no_texture="true"
      default_image_name="None"
@@ -22,32 +22,31 @@
      name="picture"
      tab_stop="false"
      top="7"
-     width="90" />
+     width="70" />
     <text
-     follows="right"
-     font="SansSerifBold"
+     follows="top|left|right"
+     font="SansSerif"
      height="20"
      layout="topleft"
-     left="100"
+     left="80"
      name="picture_name"
      text_color="black"
      top="5"
      use_ellipses="true"
-     width="170"/>
+     width="150"/>
     <text
-     follows="right"
-     font="SansSerif"
+     follows="top|left|right"
+     font="SansSerifSmall"
      height="40"
      layout="topleft"
-     left="100"
      name="picture_descr"
      text_color="white"
      top="25"
      use_ellipses="true"
-     width="170"
+     width="150"
      word_wrap="true" />
     <button
-     follows="right"
+     follows="top|right"
      height="20"
      image_disabled="navbar_bg_button.tga"
      image_disabled_selected="navbar_bg_button.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index b746fcf84b..096b60adb1 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -8,6 +8,26 @@
   collapsed="true" 
 >
   <sidetray_tab 	
+    name="sidebar_home"
+    tab_title="Home"
+    description="Home."
+    image="icn_voice-groupfocus.tga"
+    mouse_opaque="false" 
+    background_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+  >
+      <panel 
+        name="panel_home" 
+        filename="panel_sidetray_home_tab.xml" 
+        width="355" 
+        height="465" 
+        label="home" 
+        border="true" 
+      />
+  </sidetray_tab>
+
+  <sidetray_tab 	
     name="sidebar_people"
     tab_title="People"
     description="Find your friends, contacts and people nearby."
@@ -17,15 +37,6 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
-    <accordion_tab 
-      name="people_accordion" 
-      title="People" 
-      collapsable="true" 
-      min_width="200" 
-      min_height="200" 
-      expanded="true" 
-      header_visible="false"
-    >
       <panel 
         class="panel_people" 
         name="panel_people" 
@@ -35,7 +46,6 @@
         label="People" 
         border="true" 
       />
-    </accordion_tab>
   </sidetray_tab>
   <!-- *TODO Vadim: isn't the sidetray_tab "label" attribute redundant since we have "tab_title" ? -->
   <sidetray_tab 
@@ -48,14 +58,6 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
-    <accordion_tab 
-      name="places_accordian" 
-      title="Places" 
-      collapsable="true" 
-      min_width="355" 
-      min_height="200" 
-      header_visible="false"
-    >
       <panel 
         class="panel_places" 
         name="panel_places" 
@@ -63,7 +65,6 @@
         label="Places" 
         border="true"
       />
-    </accordion_tab>
   </sidetray_tab>
   
   <sidetray_tab 
@@ -75,14 +76,6 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
-    <accordion_tab 
-      name="me_accordion" 
-      title="Me" 
-      collapsable="false" 
-      min_width="200" 
-      min_height="200"
-      header_visible="false"
-    >
       <panel 
         class="panel_me_profile" 
         name="panel_me_profile" 
@@ -90,7 +83,6 @@
         label="Me" 
         border="true"
       />
-    </accordion_tab>
   </sidetray_tab>
   
   <!--
@@ -107,7 +99,7 @@
       name="group_accordion" 
       title="Group General"
       expanded="true"
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       header_visible="true"
@@ -187,7 +179,7 @@
     <accordion_tab 
       name="floater_preview_animation" 
       title="Preview Animation" 
-      collapsable="true"
+      collapsible="true"
       expanded="false"
       min_width="200" 
       min_height="200" 
@@ -206,7 +198,7 @@
     <accordion_tab 
       name="floater_preview_gesture" 
       title="Preview Gesture" 
-      collapsable="true"
+      collapsible="true"
       expanded="false"
       min_width="200" 
       min_height="200" 
@@ -225,7 +217,7 @@
     <accordion_tab 
       name="floater_preview_existing_landmark" 
       title="Preview Existing Landmark" 
-      collapsable="true"
+      collapsible="true"
       expanded="false"
       min_width="200" 
       min_height="200" 
@@ -244,7 +236,7 @@
     <accordion_tab 
       name="floater_preview_sound" 
       title="Preview Sound" 
-      collapsable="true"
+      collapsible="true"
       expanded="false"
       min_width="200" 
       min_height="200" 
@@ -263,7 +255,7 @@
     <accordion_tab 
       name="floater_preview_url" 
       title="Preview URL" 
-      collapsable="true"
+      collapsible="true"
       expanded="false"
       min_width="200" 
       min_height="200" 
@@ -282,7 +274,7 @@
     <accordion_tab 
       name="floater_URL_entry" 
       title="URL Entry" 
-      collapsable="true"
+      collapsible="true"
       expanded="false"
       min_width="200" 
       min_height="200" 
@@ -313,7 +305,7 @@
     <accordion_tab 
       name="panel_region_covenant" 
       title="Region Covenant" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -332,7 +324,7 @@
     <accordion_tab 
       name="panel_region_debug" 
       title="Region Debug" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -351,7 +343,7 @@
   <accordion_tab 
       name="panel_region_estate" 
       title="Region Estate" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -370,7 +362,7 @@
   <accordion_tab 
       name="panel_region_general" 
       title="Region General" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -389,7 +381,7 @@
   <accordion_tab 
       name="panel_region_terrain" 
       title="Region Terrain" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -408,7 +400,7 @@
   <accordion_tab 
       name="panel_region_texture" 
       title="Region Texture" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -427,7 +419,7 @@
   <accordion_tab 
       name="floater_region_info" 
       title="Region Info" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -458,7 +450,7 @@
     <accordion_tab 
       name="floater_tools" 
       title="Tools" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -477,7 +469,7 @@
     <accordion_tab 
       name="floater_bulk_perms" 
       title="Bulk Perms" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -496,7 +488,7 @@
     <accordion_tab 
       name="floater_build_options" 
       title="Build Options" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -528,7 +520,7 @@
     <accordion_tab 
       name="floater_gesture" 
       title="Gestures" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -548,7 +540,7 @@
     <accordion_tab 
       name="floater_buy_contents" 
       title="Buy Contents" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -567,7 +559,7 @@
     <accordion_tab 
       name="floater_buy_object" 
       title="Buy Object" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -586,7 +578,7 @@
     <accordion_tab 
       name="floater_inventory_view_finder" 
       title="Inventory View Finder" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -605,7 +597,7 @@
     <accordion_tab 
       name="floater_mute" 
       title="Mute" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -624,7 +616,7 @@
      <accordion_tab 
       name="floater_sell_land" 
       title="Sell Land" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
@@ -643,7 +635,7 @@
      <accordion_tab 
       name="floater_telehub" 
       title="Telehub" 
-      collapsable="true" 
+      collapsible="true" 
       min_width="200" 
       min_height="200" 
       expanded="false" 
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
new file mode 100644
index 0000000000..a85662603d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+
+<panel
+  name="home_tab"
+  title="home_tab"
+  visible="true"
+  width="300"
+  height="420"
+  background_opaque="false"
+  background_visible="true"
+  bevel_style="in"
+  follows="left|top|right|bottom">
+		<panel 
+			left="10" width="280" height="130" 
+			background_visible="true" 
+			background_opaque="false" 
+			bg_alpha_color="0.3 0.3 0.3 1.0" 
+			name="sidebar_people"
+			follows="left|top|right"
+			class="panel_sidetray_home_info">
+    			<text
+        			top="-10" width="200" left="5" height="30" follows="left|right|top"
+        			font="SansSerifHugeBold" text_color="white" word_wrap="true"
+        			mouse_opaque="false" name="tab_name" >
+					People
+    			</text>
+    			<icon
+      				top="-10" right="-10" width="20" height="20" follows="top|right"
+      				color="1 1 1 1" enabled="true" image_name="icn_voice-groupfocus.tga"
+      				mouse_opaque="false" name="tab_icon"/>
+  				<text
+      				top="-40" left="10" right="-10" height="120" follows="left|right|bottom"
+      				font="SansSerifBig" text_color="white" word_wrap="true"
+      				mouse_opaque="false" name="tab_description" >    
+					Find your friends, contacts and people nearby.
+  				</text>
+		</panel> 
+		<panel 
+			left="10" width="280" height="130" 
+			background_visible="true" 
+			background_opaque="false" 
+			bg_alpha_color="0.3 0.3 0.3 1.0" 
+			name="sidebar_places"
+			follows="left|top|right"
+			class="panel_sidetray_home_info">
+    			<text
+        			top="-10" width="200" left="5" height="30" follows="left|right|top"
+        			font="SansSerifHugeBold" text_color="white" word_wrap="true"
+        			mouse_opaque="false" name="tab_name" >
+					Places
+    			</text>
+    			<icon
+      				top="-10" right="-10" width="20" height="20" follows="top|right"
+      				color="1 1 1 1" enabled="true" image_name="inv_item_landmark.tga"
+      				mouse_opaque="false" name="tab_icon"/>
+  				<text
+      				top="-40" left="10" right="-10" height="120" follows="left|right|bottom|top"
+      				font="SansSerifBig" text_color="white" word_wrap="true"
+      				mouse_opaque="false" name="tab_description" >    
+					Find your friends, contacts and people nearby.
+  				</text>
+		</panel> 
+		<panel 
+			left="10" width="280" height="130" 
+			background_visible="true" 
+			background_opaque="false" 
+			bg_alpha_color="0.3 0.3 0.3 1.0" 
+			name="sidebar_me"
+			follows="left|top|right"
+			class="panel_sidetray_home_info">
+    			<text
+        			top="-10" width="200" left="5" height="30" follows="left|right|top"
+        			font="SansSerifHugeBold" text_color="white" word_wrap="true"
+        			mouse_opaque="false" name="tab_name" >
+					Me
+    			</text>
+    			<icon
+      				top="-10" right="-10" width="20" height="20" follows="top|right"
+      				color="1 1 1 1" enabled="true" image_name="icn_voice-pvtfocus.tga"
+      				mouse_opaque="false" name="tab_icon"/>
+  				<text
+      				top="-40" left="10" right="-10" height="120" follows="left|right|bottom"
+      				font="SansSerifBig" text_color="white" word_wrap="true"
+      				mouse_opaque="false" name="tab_description" >    
+					Change your profile, your look and quick links to your outfits.
+  				</text>
+		</panel> 
+</panel> 
+  
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 8952ea1307..ba4915e074 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -17,16 +17,16 @@
   bg_alpha_color="0.3 0.3 0.3 1.0">
 
   <text
-   type="string"
    visible="false"
    follows="left|top|right|bottom"
    font="SansSerifBold"
    height="40"
    layout="topleft"
    left="60"
-   name="text"
+   name="toast_text"
+   word_wrap="true"
    text_color="white"
-   top="30"
+   top="20"
    width="290">
     Toast text;
   </text>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 149da313a2..e5665b0194 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -652,6 +652,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<string name="Stage">Stage</string>	
 	<string name="Other">Other</string>	
 	<string name="Any">Any</string>	
+	<string name="You">You</string>							
 						
 	<!-- puncutations -->
 	<string name=":">:</string>			
@@ -785,4 +786,6 @@ If you continue to receive this message, contact customer support.
 	<string name="UTCTimeMin">min,datetime,utc</string>
 	<string name="UTCTimeSec">second,datetime,utc</string>
 	<string name="UTCTimeTimezone">timezone,datetime,utc</string>							
+	
+	
 </strings>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index efb9a89c6a..eb9bb99b20 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -10,16 +10,13 @@
                 add_landmark_image_enabled="Favorite_Star_Active"
                 add_landmark_image_disabled="Favorite_Star_Off"
                 hover_glow_amount="0.15"
-                add_landmark_width="20"
-                add_landmark_height="20"
                 add_landmark_hpad="2"
                 allow_text_entry="true"
-                arrow_image="Combobox_Selected"
                 list_position="below"
       	        show_text_as_tentative="false"
                 max_chars="20"
                 follows="left|top"
-                background="TextField_Off">
+                >
   <info_button name="Place Information"
                           label=""
                           tool_tip="About current location"
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index 7004de8475..b33acf81cc 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -3,6 +3,5 @@
             thumb_outline_color="SliderThumbOutlineColor"
             thumb_center_color="SliderThumbCenterColor"
             thumb_image="SliderThumb_Off"
-            hover_glow_amount="0.15"
             track_image="SliderTrack_Horiz"
             track_highlight_image="SliderTrack_Horiz" />