summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2009-11-09 13:16:18 -0800
committerMark Palange (Mani) <palange@lindenlab.com>2009-11-09 13:16:18 -0800
commitb34b82f7fea702b7cb4309195314c45fd3d2e630 (patch)
tree8af0d2b7f2670902d9b3d7cf878081ffd7aacab7 /indra/newview/skins/default/xui/en/panel_navigation_bar.xml
parent06ba4927aa8d288b843ed1380132c14938708707 (diff)
parentdc5db676efd340bccd2c6f376c0bcba77e0507c4 (diff)
Automated merge with ssh://hg.lindenlab.com/brad/brad-parabuild
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_navigation_bar.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_navigation_bar.xml5
1 files changed, 3 insertions, 2 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 44fd44cde5..a90337d31a 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -7,7 +7,7 @@
height="65"
layout="topleft"
name="navigation_bar"
- chrome="true"
+ chrome="true"
width="600">
<icon
follows="all"
@@ -145,7 +145,8 @@
top_delta="0"
width="200" >
<combo_editor
- label="Search" />
+ label="Search [SECOND_LIFE]"
+ name="search_combo_editor"/>
</search_combo_box>
</panel>