diff options
author | Kent Quirk <q@lindenlab.com> | 2009-12-30 21:20:47 -0500 |
---|---|---|
committer | Kent Quirk <q@lindenlab.com> | 2009-12-30 21:20:47 -0500 |
commit | 6f66ec64b9e360a002a6d658327b72aaaab9325a (patch) | |
tree | 8008a09616c54779ad1524d1306946f4fa6d6115 /indra/newview/skins/default/xui/en/panel_bars.xml | |
parent | 99aac097cccb2885b9209a7573226a6048fabd83 (diff) | |
parent | e9d799801da4c6c9b8ba3facf7e93bbe9906fe18 (diff) |
automated merge PE->viewer2.0
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_bars.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_bars.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_bars.xml b/indra/newview/skins/default/xui/en/panel_bars.xml index 527ec4e007..96722ce278 100644 --- a/indra/newview/skins/default/xui/en/panel_bars.xml +++ b/indra/newview/skins/default/xui/en/panel_bars.xml @@ -9,7 +9,7 @@ width="1024"> <layout_stack name="menu_stack" orientation="vertical" height="768" border_size="0"> <panel auto_resize="false" width="1024" name="status_bar" filename="panel_status_bar.xml"/> - <panel auto_resize="false" width="1024" height="65" name="navigation bar" filename="panel_navigation_bar.xml"/> + <panel auto_resize="false" width="1024" height="60" name="navigation bar" filename="panel_navigation_bar.xml"/> <layout_stack name="hud_stack" orientation="horizontal" auto_resize="true" width="1024" height="500" follows="all"> <panel auto_resize="true" name="floater_view" height="500"/> <panel auto_resize="false" filename="panel_side_tray.xml" height="500" width="333"/> |