diff options
| author | Richard Linden <none@none> | 2012-02-08 16:51:30 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-08 16:51:30 -0800 |
| commit | dd2bf737e08b3457dcd982ece5e200499dacf7d8 (patch) | |
| tree | 6fb56f14a3d1e35054b5e30b2cba369c85788b2e /indra/newview | |
| parent | 1b50125546e898f703879a3fe759fefd442e97b9 (diff) | |
| parent | e482e677b2dece8cc46008f4fb05e4927ec70b4e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_toolbar.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml index 0c41c3ba2f..067c1fed82 100644 --- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml @@ -7,7 +7,7 @@ name="floater_test_toolbar" translate="false" width="500"> - <!--<toolbar name="test_toolbar_top" + <toolbar name="test_toolbar_top" button_display_mode="icons_with_text" follows="left|right|top" height="50" @@ -20,7 +20,7 @@ <command name="avatar"/> <command name="build"/> <command name="chat"/> - </toolbar>--> + </toolbar> <toolbar name="test_toolbar_left" button_display_mode="icons_with_text" follows="left|bottom|top" @@ -46,7 +46,7 @@ <command name="build"/> <command name="chat"/> </toolbar> - <!--<toolbar name="test_toolbar_bottom" + <toolbar name="test_toolbar_bottom" button_display_mode="icons_with_text" follows="left|right|bottom" height="50" @@ -58,5 +58,5 @@ <command name="avatar"/> <command name="build"/> <command name="chat"/> - </toolbar>--> + </toolbar> </floater> |