From cdba1674c5293f5d55c059ada18eb1a1b75cf1e8 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 22 Sep 2011 13:27:59 +0300
Subject: EXP-1203 ADDITIONAL FIX (As a FUI user, I want the address bar and
 favorites to be on one line)

- Changed member variable name mChevronButton to mMoreTextBox

- Fixed some bugs which PE testers have found:
          1. Parcel characteristics icons from location bar overlay other ui elements
          2. Navigation & Favorites bar are displayed after exitting mouselook mode although 'Show Navigation & Favorites bar' is unchecked
---
 .../skins/default/xui/en/panel_navigation_bar.xml        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 9aa2da5abd..54befa38e9 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -9,7 +9,7 @@
  layout="topleft"
  name="navigation_bar"
  chrome="true"
- width="600">
+ width="800">
 	<icon
 	 follows="all"
 	 image_name="NavBar_BG"
@@ -54,15 +54,15 @@
        name="nvp_stack"
        orientation="horizontal"
        top="0"
-       width="600">
+       width="800">
          <layout_panel
            follows="top|left"
            layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="400"
+           min_width="500"
            name="navigation_layout_panel"
-           width="400">
+           width="500">
              <panel
                background_visible="false"
                follows="left|top|right"
@@ -71,7 +71,7 @@
                layout="topleft"
                left="0"
                name="navigation_panel"
-               width="400">
+               width="500">
                  <pull_button
                    follows="left|top"
                    direction="down"
@@ -118,7 +118,7 @@
                    mouse_opaque="false"
                    name="location_combo"
                    top_delta="0"
-                   width="113">
+                   width="213">
                  <combo_list
                    mouse_wheel_opaque="true"/>
                  </location_input>
@@ -174,7 +174,7 @@
            user_resize="true"
            min_width="190"
            name="favorites_layout_panel"
-           width="190">
+           width="290">
              <favorites_bar
                follows="left|right|top"
                font="SansSerifSmall"
@@ -184,7 +184,7 @@
                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">
+               width="290">
                  <label
                    follows="left|top"
                    height="15"
-- 
cgit v1.2.3