summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Linden <chuck@lindenlab.com>2010-02-01 18:23:22 -0500
committerChuck Linden <chuck@lindenlab.com>2010-02-01 18:23:22 -0500
commitfdc32a367f2f7e19010a26ef338163474850e8bd (patch)
tree1b8e6144e721102f93e5ff4be0f7dc57065cb770
parent2fea74af062cb0da409d82fbae4a40eca2c57323 (diff)
parentf119b1652d3fc72e3cbd19b3f95ac1ce1f87ed34 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
-rw-r--r--indra/newview/skins/default/xui/en/panel_navigation_bar.xml16
1 files changed, 14 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 baa6c2e51f..5fe5db892a 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -139,11 +139,12 @@
font="SansSerifSmall"
height="15"
layout="topleft"
- left="0"
+ left="102"
name="favorite"
image_drag_indication="Accordion_ArrowOpened_Off"
bottom="55"
- width="590">
+ tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+ width="590">
<chevron_button name=">>"
image_unselected="TabIcon_Close_Off"
image_selected="TabIcon_Close_Off"
@@ -154,4 +155,15 @@
top="15"
height="15"/>
</favorites_bar>
+ <text
+ follows="left|top"
+ font.style="BOLD"
+ height="15"
+ layout="topleft"
+ left="10"
+ top_pad="-12"
+ name="favorites_bar_label"
+ text_color="LtGray"
+ tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+ width="102">Favorites Bar</text>
</panel>