summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-18 13:54:49 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-18 13:54:49 -0800
commit2c2ada26fe215e8f0a518f9aec30aa480d5ebbc6 (patch)
tree266fd970ae5215f44ef2bfeeaeb6b8d1efa52ad2 /indra
parent098bbfef99b6a52855af9076837ca521d2cdd525 (diff)
parent28fc3cbadb2b4d46b87938b74d61d5537f6c9701 (diff)
Merge with latest
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/xui/en/panel_navigation_bar.xml2
1 files changed, 0 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 305ce70fcb..4bf420b79f 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -54,8 +54,6 @@
width="800"
height="2"/>
<layout_stack
- use_border="true"
- bevel_style="none"
follows="all"
height="34"
layout="topleft"