EXP-1203 FIXED (As a FUI user, I want the address bar and favorites to be on one line)

- Relocated address bar, combined with favorite landmarks EXP-1208
- Added dragger to change amount of space allocated to address bar and favorites bar EXP-1217
- Modified Favorites ->> More spillover EXP-1218
- Combined context menu menuitems for favorites & address bars  EXP-1219

3 files changed, 177 insertions, 157 deletions

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a7d1aa963c..688349aa16 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -16,7 +16,7 @@
                 orientation="vertical"
                 top="19">
     <layout_panel auto_resize="false"
-                  height="60"
+                  height="34"
                   mouse_opaque="false"
                   name="nav_bar_container"
                   tab_stop="false"
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
index 3f38d734b9..b517fd7957 100644
--- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
@@ -9,7 +9,7 @@
  visible="false"
  width="128">
     <menu_item_check
-         label="Show Navigation Bar"
+         label="Show Navigation &amp; Favorites Bar"
          layout="topleft"
          name="ShowNavbarNavigationPanel">
            <on_click
@@ -20,17 +20,6 @@
              parameter="ShowNavbarNavigationPanel" />
     </menu_item_check>
     <menu_item_check
-         label="Show Favorites Bar"
-         layout="topleft"
-         name="ShowNavbarFavoritesPanel">
-           <on_click
-             function="ToggleControl"
-             parameter="ShowNavbarFavoritesPanel" /> 
-             <on_check
-             function="CheckControl"
-             parameter="ShowNavbarFavoritesPanel" />
-    </menu_item_check>
-    <menu_item_check
          label="Show Mini-Location Bar"
          layout="topleft"
          name="ShowMiniLocationPanel">
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 9749b6fdd4..9aa2da5abd 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -5,7 +5,7 @@
  bg_opaque_color="MouseGray"
  follows="left|top|right"
  focus_root="true" 
- height="60"
+ height="34"
  layout="topleft"
  name="navigation_bar"
  chrome="true"
@@ -16,10 +16,10 @@
 	 mouse_opaque="false"
 	 name="bg_icon"
 	 scale_image="true"
-	 visible="true"
+	 visible="false"
 	 left="0"
 	 top="0"
-	 height="60"
+	 height="34"
 	 width="600"/>
 	<icon
 	 follows="all"
@@ -30,7 +30,7 @@
 	 visible="false"
 	 left="0"
 	 top="0"
-	 height="60"
+	 height="34"
 	 width="600"/>
 	<icon
 	 follows="all"
@@ -41,145 +41,176 @@
 	 visible="false"
 	 left="0"
 	 top="0"
-	 height="60"
+	 height="34"
 	 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_bottom_pad="1"
-	     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="226">
-         <combo_list
-         mouse_wheel_opaque="true"/>
-	     <!-- *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
-	     follows="right|top"
-	     halign="right"
-	     height="23"
-	     label="Search"
-	     layout="topleft"
-	     right="-10"
-	     mouse_opaque="false"
-	     name="search_combo_box"
-	     tool_tip="Search"
-	     top_delta="0"
-	     width="244" >
-         <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"
-         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>
+	 <layout_stack
+       use_border="true"
+       bevel_style="none"
+       follows="all"
+       height="34"
+       layout="topleft"
+       left="0"
+       mouse_opaque="false"
+       name="nvp_stack"
+       orientation="horizontal"
+       top="0"
+       width="600">
+         <layout_panel
+           follows="top|left"
+           layout="topleft"
+           auto_resize="true"
+           user_resize="true"
+           min_width="400"
+           name="navigation_layout_panel"
+           width="400">
+             <panel
+               background_visible="false"
+               follows="left|top|right"
+               top="3"
+               height="23"
+               layout="topleft"
+               left="0"
+               name="navigation_panel"
+               width="400">
+                 <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_bottom_pad="1"
+                   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="all"
+                   halign="right"
+                   height="23"
+                   label="Location"
+                   layout="topleft"
+                   left_pad="7"
+                   max_chars="254"
+                   mouse_opaque="false"
+                   name="location_combo"
+                   top_delta="0"
+                   width="113">
+                 <combo_list
+                   mouse_wheel_opaque="true"/>
+                 </location_input>
+                 <search_combo_box
+                   follows="top|right"
+                   halign="right"
+                   height="23"
+                   label="Search"
+                   layout="topleft"
+                   left_pad="7"
+                   mouse_opaque="false"
+                   name="search_combo_box"
+                   tool_tip="Search"
+                   top_delta="0"
+                   width="152" >
+                     <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"
+                       mouse_wheel_opaque="true"/>
+                 </search_combo_box>
+             </panel>
+         </layout_panel>
+         
+         <layout_panel
+           auto_resize="false"
+           layout="topleft"
+           max_width="5"
+           min_width="5"
+           name="nav_bar_resize_handle_panel"
+           user_resize="false"
+           width="5">
+             <icon
+               follows="top|right"
+               height="25"
+               image_name="ChatBarHandle"
+               layout="topleft"
+               left="-6"
+               name="resize_handle"
+               top="4"
+               width="5" />
+         </layout_panel>
+         
+         <layout_panel
+           follows="top|left"
+           layout="topleft"
+           auto_resize="true"
+           user_resize="true"
+           min_width="190"
+           name="favorites_layout_panel"
+           width="190">
+             <favorites_bar
+               follows="left|right|top"
+               font="SansSerifSmall"
+               height="20"
+               layout="topleft"
+               left="0"
+               name="favorite"
+               image_drag_indication="Accordion_ArrowOpened_Off"
+               tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+               width="190">
+                 <label
+                   follows="left|top"
+                   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>
+                 <!-- More button actually is a text box. -->
+                 <more_button
+                   follows="left|bottom"
+                   font.name="SansSerifSmall"
+                   font.style="UNDERLINE"
+                   name=">>"
+                   tab_stop="false"
+                   tool_tip="Show more of My Favorites"
+                   top="15"
+                   width="50">
+                   More...
+                   </more_button>
+             </favorites_bar>
+         </layout_panel>
+     
+     </layout_stack>
 </panel>