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

EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496

17 files changed, 331 insertions, 196 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 73f0d32d12..c739d4d455 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -664,4 +664,11 @@
     <color
      name="OutputMonitorMutedColor"
      reference="DkGray2" />
+    <color
+     name="SysWellItemUnselected"
+     value="0 0 0 0" />
+    <color
+     name="SysWellItemSelected"
+     value="0.3 0.3 0.3 1.0" />
+  
 </colors>
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index 4525df31b6..02784bb74b 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -5,7 +5,7 @@ untill LLFontGL::render() is fixed to avoid this requirement-->
 <!-- All buttons in the Favorites bar will be created from this one -->
 <button
  follows="left|bottom"
- halign="left"
+ halign="center"
  height="23"
  image_disabled="transparent.j2c"
  image_disabled_selected="PushButton_Selected"
diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml
new file mode 100644
index 0000000000..38c6d44fdf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_activeim.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+	name="floater_activeim"
+	title="ACTIVE IM"
+	top="26"
+	left="0"
+	height="22"
+	width="350"
+	follows="right|bottom"
+	background_visible="true"
+	can_close="true"
+	can_dock="true"
+	can_minimize="false"
+	visible="true"
+	bg_alpha_color="0 0 0 0">
+	<scroll_container
+		follows="top|bottom"
+		layout="topleft"
+		top="20"
+		left="1"
+		width="349"
+		height="2"
+		name="panel_list_container">
+		<scrolling_panel_list
+			follows="left|right"
+			layout="topleft"
+			name="chiclet_row_panel_list"
+			width="335"/>
+	</scroll_container>
+</floater>
\ No newline at end of file
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 2d67e3d5a9..674bfa42da 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -9,6 +9,7 @@
  name="nearby_chat"
  save_rect="true"
  title="Nearby Chat"
+ single_instance="true"
  width="320">
 	<panel top="20" width="320" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="chat_caption">
     	<text
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index 468d41e2f0..46c8960fbd 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -4,96 +4,37 @@
  background_visible="true" 
  bevel_style="in"
  bg_alpha_color="0.0 0.0 0.0 0.0"
- height="60"
+ height="30"
  left="0"
  top="0" 
  follows="right|bottom"
  layout="topleft"
  name="notification_chiclet"
  save_rect="true"
- title=""
+ title="NOTIFICATIONS"
  width="320"
+ min_width="320"
  can_minimize="false"
  can_tear_off="false"
  can_resize="false"
  can_drag_on_left="false"
  can_close="false"
- can_dock="false"
+ can_dock="true"
 >
   <scroll_container
    follows="top|bottom"
    layout="topleft"
    name="notification_list_container"
-   left="1"
-   top="30"
-   width="336"
-   height="30">
+   left="0"
+   top="18"
+   width="320"
+   height="12">
     <scrolling_panel_list
-     follows="left|right"
      layout="topleft"
      name="notification_list"
-     left="0"
+     left="1"
      top="0"
-     height="20"
-     width="320" />
+     height="10"
+     width="318" />
   </scroll_container>
-
-  <panel 
-    top="0" 
-    width="320" 
-    height="30"
-    layout="topleft"
-    follows="top|left|right"
-    background_visible="true" 
-    background_opaque="false" 
-    bg_alpha_color="0.0 0.0 0.0 1.0" 
-    name="notification_caption"
-  >
-    <text
-      width="255" 
-      left="25" 
-      height="20" 
-      layout="topleft"
-      follows="left|right|top"
-      font="SansSerifBoldBig" 
-      text_color="white" 
-      word_wrap="true"
-      mouse_opaque="true" 
-      name="sender_name"
-    >
-      NOTIFICATIONS  
-    </text>
-    <button
-      top="5"
-      left="270"
-      width="15"
-      height="15"
-      layout="topleft"
-      follows="right"
-      label=""
-      toggle="true" 
-      image_unselected="arrow_up.tga"
-      image_disabled="arrow_up.tga"
-      image_selected="arrow_down.tga"
-      image_hover_selected="arrow_down.tga"
-      image_disabled_selected="arrow_down.tga"
-      name="tear_btn"
-    />    
-    <button 
-      top="5" 
-      left="300"
-      width="15" 
-      height="15"
-      layout="topleft"
-      follows="right"
-      label="" 
-      image_unselected="closebox.tga" 
-      image_disabled="closebox.tga"
-      image_selected="closebox.tga" 
-      image_hover_selected="closebox.tga"
-      image_disabled_selected="closebox.tga"
-      name="close_btn"
-    />
-  </panel>
-
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml
index 7e4bbe3c9d..76c132aeb7 100644
--- a/indra/newview/skins/default/xui/en/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/en/menu_favorites.xml
@@ -7,27 +7,59 @@
     <menu_item_call
      label="Teleport"
      layout="topleft"
-     name="Landmark Open">
+     name="Teleport To Landmark">
         <menu_item_call.on_click
          function="Favorites.DoToSelected"
          parameter="open" />
     </menu_item_call>
     <menu_item_call
-     label="About Landmark"
+     label="View/Edit Landmark"
      layout="topleft"
-     name="Teleport To Landmark">
+     name="Landmark Open">
         <menu_item_call.on_click
          function="Favorites.DoToSelected"
          parameter="about" />
     </menu_item_call>
-<!--     <menu_item_call -->
-<!--      label="Rename" -->
-<!--      layout="topleft" -->
-<!--      name="Rename"> -->
-<!--         <menu_item_call.on_click -->
-<!--          function="Favorites.DoToSelected" -->
-<!--          parameter="rename" /> -->
-<!--     </menu_item_call> -->
+    <menu_item_call
+     label="Copy SLURL"
+     layout="topleft"
+     name="Copy slurl">
+        <menu_item_call.on_click
+         function="Favorites.DoToSelected"
+         parameter="copy_slurl" />
+    </menu_item_call>
+    <menu_item_call
+     label="Show On Map"
+     layout="topleft"
+     name="Show On Map">
+        <menu_item_call.on_click
+         function="Favorites.DoToSelected"
+         parameter="show_on_map" />
+    </menu_item_call>
+
+    <menu_item_separator
+     layout="topleft" />
+
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="Landmark Copy">
+        <menu_item_call.on_click
+         function="Favorites.DoToSelected"
+         parameter="copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="Landmark Paste">
+        <menu_item_call.on_click
+         function="Favorites.DoToSelected"
+         parameter="paste" />
+    </menu_item_call>
+
+    <menu_item_separator
+     layout="topleft" />
+
     <menu_item_call
      label="Delete"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
new file mode 100644
index 0000000000..1ad10abbeb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ height="201"
+ layout="topleft"
+ left="100"
+ mouse_opaque="false"
+ name="hide_navbar_menu"
+ top="624"
+ visible="false"
+ width="128">
+    <menu_item_check
+         label="Show Navigation Bar"
+         layout="topleft"
+         name="Show Navigation Bar">
+           <menu_item_check.on_click
+             function="HideNavbarMenu.Action"
+             parameter="show_navbar_navigation_panel" />
+             <menu_item_check.on_check
+             function="HideNavbarMenu.EnableMenuItem"
+             parameter="show_navbar_navigation_panel" />
+    </menu_item_check>
+    <menu_item_check
+         label="Show Favorites Bar"
+         layout="topleft"
+         name="Show Favorites Bar">
+           <menu_item_check.on_click
+             function="HideNavbarMenu.Action"
+             parameter="show_navbar_favorites_panel" />
+             <menu_item_check.on_check
+             function="HideNavbarMenu.EnableMenuItem"
+             parameter="show_navbar_favorites_panel" />
+    </menu_item_check>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml
index 435d928f00..89469fb013 100644
--- a/indra/newview/skins/default/xui/en/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_navbar.xml
@@ -19,16 +19,15 @@
              function="Navbar.EnableMenuItem"
              parameter="show_coordinates" />
     </menu_item_check>
+    <!-- Label of 'Landmark' item is changing in runtime, 
+    see  AddLandmarkNavBarMenu/EditLandmarkNavBarMenu in strings.xml -->
     <menu_item_call
-     label="Add Landmark..."
+     label="Landmark"
      layout="topleft"
-     name="Add Landmark">
+     name="Landmark">
         <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/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
new file mode 100644
index 0000000000..8977f30a51
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+	follows="bottom|right"
+	name="panel_activeim_row"
+	layout="topleft"
+	top="0"
+	left="0"
+	height="40"
+	width="332"
+	background_visible="true"
+	bevel_style="in"
+	bg_alpha_color="0 0 0 0">
+	<chiclet_im
+		name="chiclet"
+		layout="topleft"
+		top="4"
+		left="10"
+		height="26"
+		width="45">
+	</chiclet_im>
+	<text
+		type="string"
+		name="contact_name"
+		layout="topleft"
+		top="8"
+		left="70"
+		height="20"
+		width="230"
+		length="1"
+		follows="left|top|right|bottom"
+		font="SansSerifBigBold"
+		text_color="White">Contact Name</text>
+	<button
+		name="hide_btn"
+		layout="topleft"
+		top="10"
+		left="310"
+		height="20"
+		width="20"
+		label=""
+		image_unselected="toast_hide_btn.tga"
+		image_disabled="toast_hide_btn.tga"
+		image_selected="toast_hide_btn.tga"
+		image_hover_selected="toast_hide_btn.tga"
+		image_disabled_selected="toast_hide_btn.tga">
+	</button>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 5e2e2267f6..9910f99c17 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -245,9 +245,11 @@
                height="20"
                left="18"
                top="23"/>
+<!-- 
 			  <chiclet_notification.commit_callback
 				 function="Notification.Show"
 				 parameter="ClickUnimplemented" />
+ -->               				 
 			</chiclet_notification>
         </layout_panel>
         <icon
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 4f179d7a16..93fc938622 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
@@ -53,7 +53,7 @@
 	 top="632"
 	 left="75"	 
 	 height="20"
-     ont="SansSerifSmall"
+     font="SansSerifSmall"
      label="Refresh"
      label_selected="Refresh"
      name="btn_refresh"
@@ -69,7 +69,7 @@
      left="5"
      visible="false"
      width="65" />
-      <accordion layout="topleft" left="2" width="296" top="28" height="600" follows="all" name="panel_me_profile">
+      <accordion layout="topleft" left="2" width="296" top="28" height="600" follows="all" name="group_general_tab">
 		<accordion_tab min_height="515" title="Group General" name="group_general_tab">
         	<panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/>
 		</accordion_tab>
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 8d90c6ebf0..f821dcd839 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -132,6 +132,7 @@
      layout="topleft"
      left="5"
      name="favorite"
+     chevron_button_tool_tip="Show more of My Favorites"
      top="32"
      width="590" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index b934312971..1efe287cbe 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -16,11 +16,20 @@
      name="no_one_near"
      value="No-one near" />
     <string
-     name="no_friends"
-     value="No friends" />
+     name="no_friends_online"
+     value="No friends online" />
+    <string
+     name="no_friends_offline"
+     value="No friends offline" />
     <string
      name="no_groups"
      value="No groups" />
+    <string
+     name="people_filter_label"
+     value="Filter People" />
+    <string
+     name="groups_filter_label"
+     value="Filter Groups" />
     <filter_editor
      background_image="TextField_Search_Off"
      follows="left|top|right"
@@ -85,7 +94,7 @@
              width="285">
                 <button
                  enabled="false"
-                 follows="bottom|right"
+                 follows="bottom|left"
                  font="SansSerifBigBold"
                  height="18"
                  image_selected="OptionsMenu_Press"
@@ -107,14 +116,65 @@
          layout="topleft"
          name="friends_panel"
          width="285">
-            <avatar_list
+            <accordion
              follows="left|top|right|bottom"
              height="357"
              layout="topleft"
              left="0"
-             name="avatar_list"
+             name="friends_accordion"
              top="2"
-             width="285" />
+             width="285">
+                <accordion_tab
+                 can_resize="false"
+                 layout="topleft"
+                 min_height="100"
+                 name="tab_online"
+                 title="Online">
+                    <panel
+                     follows="all"
+                     height="150"
+                     layout="topleft"
+                     left="0"
+                     name="tab_online_panel"
+                     top="100"
+                     width="285">
+                        <avatar_list
+                         draw_heading="false"
+                         follows="all"
+                         height="145"
+                         layout="topleft"
+                         left="0"
+                         name="avatars_online"
+                         top="0"
+                         width="285" />
+                    </panel>
+                </accordion_tab>
+                <accordion_tab
+                 can_resize="false"
+                 layout="topleft"
+                 min_height="100"
+                 name="tab_offline"
+                 title="Offline">
+                    <panel
+                     follows="all"
+                     height="260"
+                     layout="topleft"
+                     left="0"
+                     name="tab_offline_panel"
+                     top="100"
+                     width="285">
+                        <avatar_list
+                         draw_heading="false"
+                         follows="all"
+                         height="255"
+                         layout="topleft"
+                         left="0"
+                         name="avatars_offline"
+                         top="0"
+                         width="285" />
+                    </panel>
+                </accordion_tab>
+            </accordion>
             <panel
              background_visible="true"
              bevel_style="none"
@@ -128,7 +188,7 @@
              width="285">
                 <button
                  enabled="false"
-                 follows="bottom|right"
+                 follows="bottom|left"
                  font="SansSerifBigBold"
                  height="18"
                  image_selected="OptionsMenu_Press"
@@ -195,7 +255,7 @@
              width="285">
                 <button
                  enabled="false"
-                 follows="bottom|right"
+                 follows="bottom|left"
                  font="SansSerifBigBold"
                  height="18"
                  image_selected="OptionsMenu_Press"
@@ -275,7 +335,7 @@
              width="285">
                 <button
                  enabled="false"
-                 follows="bottom|right"
+                 follows="bottom|left"
                  font="SansSerifBigBold"
                  height="18"
                  image_selected="OptionsMenu_Press"
@@ -298,7 +358,6 @@
      left="10"
      name="button_bar"
      orientation="horizontal"
-     top_pad="0"
      width="295">
         <layout_panel
          default_tab_group="1"
@@ -318,17 +377,17 @@
              name="view_profile_btn"
              width="65" />
         </layout_panel>
-<!--        <layout_panel
+        <layout_panel
          default_tab_group="1"
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
+         left_delta="0"
          min_width="85"
          name="add_friend_btn_panel"
          top_delta="0"
          width="85">
-           <button
+            <button
              follows="top|left|right"
              font="SansSerifSmallBold"
              height="25"
@@ -336,13 +395,12 @@
              layout="topleft"
              name="add_friend_btn"
              width="85" />
-        </layout_panel>-->
+        </layout_panel>
         <layout_panel
          default_tab_group="1"
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
          min_width="80"
          name="group_info_btn_panel"
          width="80">
@@ -360,7 +418,6 @@
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
          min_width="45"
          name="chat_btn_panel"
          top_delta="0"
@@ -379,7 +436,6 @@
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
          min_width="35"
          name="im_btn_panel"
          top_delta="0"
@@ -398,7 +454,6 @@
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
          min_width="40"
          name="call_btn_panel"
          top_delta="0"
@@ -419,7 +474,6 @@
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
          min_width="65"
          name="teleport_btn_panel"
          top_delta="0"
@@ -439,7 +493,6 @@
          follows="left|top|right"
          height="25"
          layout="topleft"
-         left_pad="0"
          min_width="50"
          name="share_btn_panel"
          top_delta="0"
@@ -455,31 +508,5 @@
              name="share_btn"
              width="50" />
         </layout_panel>
-<!--        <layout_panel
-         default_tab_group="1"
-         follows="left|top|right"
-         height="25"
-         layout="topleft"
-         left_pad="0"
-         min_width="40"
-         name="more_btn_panel"
-         top_delta="0"
-         width="40">
-            <button
-             enabled="false"
-             follows="top|right"
-             font="SansSerifSmallBold"
-             height="25"
-             label="&gt;&gt;"
-             layout="topleft"
-             name="more_btn"
-             width="40" />
-        </layout_panel>-->
     </layout_stack>
-  <string name="people_filter_label">
-    Filter People
-  </string>
-  <string name="groups_filter_label">
-    Filter Groups
-  </string>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 73cd988103..edaa8f7fa7 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -40,78 +40,91 @@
      scale_image="false"
      top="8"
      width="13" />
+
     <tab_container
-     follows="left|top|right|bottom"
+     follows="all"
      height="326"
      layout="topleft"
      left="9"
      name="Places Tabs"
      tab_position="top"
-     top_pad="15"
+     top="30"
      width="285" />
-    <button
-     follows="bottom|left"
-     font="SansSerifSmallBold"
-     height="25"
-     image_disabled="widgets/SegmentedBtn_Left_Disabled.png"
-     image_selected="widgets/SegmentedBtn_Left_Selected.png"
-     image_unselected="widgets/SegmentedBtn_Left_Off.png"
-     label="Create"
-     layout="topleft"
-     left="10"
-     name="create_landmark_btn"
-     top_pad="5"
-     visible="false"
-     width="60" />
-    <button
-     follows="bottom|left"
-     font="SansSerifSmallBold"
-     height="25"
-     image_disabled="widgets/ComboButton_Disabled.png"
-     image_selected="widgets/ComboButton_Selected.png"
-     image_unselected="widgets/ComboButton_Off.png"
-     label="▼"
-     layout="topleft"
-     top_pad="0"
-     name="folder_menu_btn"
-     visible="false"
-     left_pad="5"
-     width="20" />
-    <button
-     follows="bottom|left"
-     font="SansSerifSmallBold"
-     height="25"
-     label="Teleport"
-     layout="topleft"
-     left="10"
-     top_pad="0"
-     name="teleport_btn"
-     width="80" />
-    <button
-     follows="bottom|left"
-     font="SansSerifSmallBold"
-     height="25"
-     label="Map"
-     layout="topleft"
-     name="map_btn"
-     left_pad="5"
-     width="80" />
-    <button
-     enabled="false"
-     follows="bottom|left"
-     font="SansSerifSmallBold"
-     height="25"
-     left_pad="5"
-     label="Share"
-     layout="topleft"
-     name="share_btn"
-     width="60" />
     <panel
      class="panel_place_info"
      filename="panel_place_info.xml"
      follows="all"
      layout="topleft"
+     top="30"
+     height="326"
      left="0"
      name="panel_place_info"
      visible="false" />
+    
+    <panel
+     name="button_panel"
+     layout="topleft"
+     height="25"
+     left="0"
+     top_pad="10"
+     width="305">
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Teleport"
+         layout="topleft"
+         left="5"
+         top="0"
+         name="teleport_btn"
+         width="80" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Map"
+         layout="topleft"
+         name="map_btn"
+         left_pad="5"
+         top="0"
+         width="80" />
+        <button
+         enabled="false"
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         left_pad="5"
+         top="0"
+         label="Share"
+         layout="topleft"
+         name="share_btn"
+         width="60" />
+
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         image_disabled="widgets/SegmentedBtn_Left_Disabled.png"
+         image_selected="widgets/SegmentedBtn_Left_Selected.png"
+         image_unselected="widgets/SegmentedBtn_Left_Off.png"
+         label="Create"
+         layout="topleft"
+         left="5"
+         top="0"
+         name="create_landmark_btn"
+         width="60" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         image_disabled="widgets/ComboButton_Disabled.png"
+         image_selected="widgets/ComboButton_Selected.png"
+         image_unselected="widgets/ComboButton_Off.png"
+         label="▼"
+         layout="topleft"
+         name="folder_menu_btn"
+         left_pad="0"
+         top="0"
+         width="20" />
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
index eccb919b04..3c49ce311a 100644
--- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
@@ -10,7 +10,7 @@
 	width="318"
 	height="35"
   layout="topleft"
-  follows="top"
+  follows="left|right"
   background_opaque="false"
   background_visible="true"
   bg_alpha_color="0.0 0.0 0.0 0.0" >
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 05ebcbb50b..82d6945e0f 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Teleport History" bottom="0" height="326" left="0" width="380"
      border="true" follows="left|top|right|bottom">
-	<scroll_list bottom="0" column_padding="0" draw_heading="true"
+	<scroll_list bottom="0" column_padding="0" draw_heading="false"
 	     draw_stripes="false" follows="left|top|bottom|right" left="0"
 	     multi_select="false" name="history_items" search_column="1"
 	     sort_column="1" height="326" width="380" >
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0ed473a01a..fb1aa25b25 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -610,6 +610,8 @@ you managed for [OWNER]
 		Unknown file extension .%s
 Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	</string>		
+	<string name="AddLandmarkNavBarMenu">Add Landmark...</string>	 
+	<string name="EditLandmarkNavBarMenu">Edit Landmark...</string>
 	
 	<!-- Previews -->
 	<string name="FileSaved">File Saved</string>