summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-09-26 20:37:02 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2011-09-26 20:37:02 +0300
commit679a028fcc5615b9725bf11f6949634617fad06d (patch)
treed0dd3ae60a1e4b5f695971a0a19d7c8b530fb688 /indra/newview/skins/default/xui
parentb72c8df1f6aac0932ae587a6a94fd87db5007366 (diff)
EXP-1203 ADDITIONAL FIX (As a FUI user, I want the address bar and favorites to be on one line)
- Removed search combobox by spec - Fixed EXP-1243 (Parcel characteristics icons from location bar overlay other ui elements) - Fixed EXP-1245 (More spillover list "jumps" on copying landmarks)
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_navigation_bar.xml37
1 files changed, 7 insertions, 30 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
index 54befa38e9..719d3531ed 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -60,9 +60,9 @@
layout="topleft"
auto_resize="true"
user_resize="true"
- min_width="500"
+ min_width="340"
name="navigation_layout_panel"
- width="500">
+ width="340">
<panel
background_visible="false"
follows="left|top|right"
@@ -71,7 +71,7 @@
layout="topleft"
left="0"
name="navigation_panel"
- width="500">
+ width="340">
<pull_button
follows="left|top"
direction="down"
@@ -118,33 +118,10 @@
mouse_opaque="false"
name="location_combo"
top_delta="0"
- width="213">
+ width="215">
<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>
@@ -172,9 +149,9 @@
layout="topleft"
auto_resize="true"
user_resize="true"
- min_width="190"
+ min_width="335"
name="favorites_layout_panel"
- width="290">
+ width="335">
<favorites_bar
follows="left|right|top"
font="SansSerifSmall"
@@ -184,7 +161,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="290">
+ width="331">
<label
follows="left|top"
height="15"