Merge

1 files changed, 175 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
new file mode 100644
index 0000000000..d484564e0d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="true"
+ bg_opaque_color="MouseGray"
+ follows="left|top|right"
+ height="60"
+ layout="topleft"
+ name="navigation_bar"
+ chrome="true"
+ width="600">
+	<icon
+	 follows="all"
+	 image_name="NavBar_BG"
+	 mouse_opaque="false"
+	 name="bg_icon"
+	 scale_image="true"
+	 visible="true"
+	 left="0"
+	 top="0"
+	 height="60"
+	 width="600"/>
+	<icon
+	 follows="all"
+	 image_name="NavBar_BG_NoFav"
+	 mouse_opaque="false"
+	 name="bg_icon_no_fav"
+	 scale_image="true"
+	 visible="false"
+	 left="0"
+	 top="0"
+	 height="50"
+	 width="600"/>
+	<panel
+	 background_visible="false"
+	 follows="left|top|right"
+	 top="3"
+	 height="23"
+	 layout="topleft"
+	 name="navigation_panel"
+	 width="600">
+	     <pull_button
+	     follows="left|top"
+	     direction="down"
+	     height="23"
+	     image_overlay="Arrow_Left_Off"
+	     image_bottom_pad="1"
+	     layout="topleft"
+	     left="10"
+	     name="back_btn"
+	     tool_tip="Go back to previous location"
+	     top="2"
+	     width="31" />
+	    <pull_button
+	     follows="left|top"
+	     direction="down"
+	     height="23"
+	     image_overlay="Arrow_Right_Off"
+	     image_bottom_pad="1"
+	     layout="topleft"
+	     left_pad="0"
+	     name="forward_btn"
+	     tool_tip="Go forward one location"
+	     top_delta="0"
+	     width="31" />
+	    <button
+	     follows="left|top"
+	     height="23"
+	     image_overlay="Home_Off"
+	     layout="topleft"
+	     left_pad="7"
+	     name="home_btn"
+	     tool_tip="Teleport to my home location"
+	     top_delta="0"
+	     width="32" />
+	    <location_input
+	     follows="left|right|top"
+	     halign="right"
+	     height="23"
+	     label="Location"
+	     layout="topleft"
+	     left_pad="7"
+	     max_chars="254"
+	     mouse_opaque="false"
+	     name="location_combo"
+	     top_delta="0"
+	     width="266">
+	     <!-- *TODO: Delete.  Let the location_input use the correct art sizes.
+	        <location_input.add_landmark_button
+	         height="18"
+	         name="location_combo_add"
+	         width="20" />
+	        <location_input.info_button
+	         height="18"
+	         name="location_combo_info"
+	         width="20" />
+	      -->
+	    </location_input>
+	<!--     <button -->
+	<!--      follows="right|top" -->
+	<!--      height="20" -->
+	<!--      image_disabled="TextField_Search_Off" -->
+	<!--      image_disabled_selected="TextField_Search_Off" -->
+	<!--      image_hover_selected="TextField_Search_Off" -->
+	<!--      image_hover_unselected="TextField_Search_Off" -->
+	<!--      image_selected="TextField_Search_Off" -->
+	<!--      image_unselected="TextField_Search_Off" -->
+	<!--      layout="topleft" -->
+	<!--      left_pad="5" -->
+	<!--      mouse_opaque="false" -->
+	<!--      name="search_bg" -->
+	<!--      top_delta="0" -->
+	<!--      width="168" /> -->
+        <search_combo_box
+	     bevel_style="none"
+	     border_style="line"
+	     border.border_thickness="0"
+	     commit_on_focus_lost="false"
+	     follows="right|top"
+	     halign="right"
+	     height="22"
+	     label="Search"
+	     layout="topleft"
+	     right="-10"
+	     mouse_opaque="false"
+	     name="search_combo_box"
+	     tool_tip="Search"
+	     top_delta="0"
+	     width="200" >
+         <combo_editor
+          label="Search [SECOND_LIFE]"
+          name="search_combo_editor"/>
+         <combo_list
+          draw_border="true"
+          border.highlight_light_color="FocusColor"
+          border.highlight_dark_color="FocusColor"
+          border.shadow_light_color="FocusColor"
+          border.shadow_dark_color="FocusColor"/>
+        </search_combo_box>
+	</panel>
+    <favorites_bar
+     follows="left|right|top"
+     font="SansSerifSmall"
+     height="15"
+     layout="topleft"
+     left="0"
+     name="favorite"
+     image_drag_indication="Accordion_ArrowOpened_Off"
+     bottom="55"
+     tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+               width="590">
+        <label
+         follows="left|top"
+         font.style="BOLD"
+         height="15"
+         layout="topleft"
+         left="10"
+         name="favorites_bar_label"
+         text_color="LtGray"
+         tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+         top="12"
+         width="102">
+          Favorites Bar
+        </label>
+    <chevron_button name=">>"
+                     image_unselected="TabIcon_Close_Off"
+                     image_selected="TabIcon_Close_Off"
+                     tab_stop="false"
+                     follows="left|bottom"
+                     tool_tip="Show more of My Favorites"
+                     width="15"
+		     top="15"
+                     height="15"/>
+  </favorites_bar>
+</panel>