diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-29 15:27:33 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-29 15:27:33 -0700 |
| commit | 7c92576310bf6ec38eed9368f75ecf23b2960ed9 (patch) | |
| tree | 0bdc92973a35760b7d9f903c3580d1efac1cd71f /indra/newview | |
| parent | cf4f436e5bda78096c945b1de0e0f6c923a9152d (diff) | |
| parent | fc9c94864d9407e43b97619b530402728f5622ca (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/toolbars.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_toolbars.xml | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml index 55327ea919..19dec78c63 100644 --- a/indra/newview/app_settings/toolbars.xml +++ b/indra/newview/app_settings/toolbars.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <toolbars> - <bottom_toolbar> + <bottom_toolbar + button_display_mode="0"> <command name="chat"/> <command name="speak"/> <command name="places"/> @@ -10,7 +11,8 @@ <command name="move"/> <command name="howto"/> </bottom_toolbar> - <left_toolbar> + <left_toolbar + button_display_mode="1"> <command name="avatar"/> <command name="inventory"/> <command name="snapshot"/> diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml index de13fec670..59912b5503 100644 --- a/indra/newview/skins/default/xui/en/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml @@ -12,11 +12,11 @@ <menu_item_separator layout="topleft" /> <menu_item_check label="Icons and labels" layout="topleft" - name="icons_and_labels"> + name="icons_with_text"> <on_click function="Toolbars.EnableSetting" - parameter="icons_and_labels" /> + parameter="icons_with_text" /> <on_check function="Toolbars.CheckSetting" - parameter="icons_and_labels" /> + parameter="icons_with_text" /> </menu_item_check> <menu_item_check label="Icons only" layout="topleft" |