diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-21 17:25:38 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-21 17:25:38 -0700 |
| commit | 412e29ed9d62e975a5290c6008558a739b88065d (patch) | |
| tree | 4fa73ecfb7c661270a6562c7831d703511d17731 /indra/newview/skins | |
| parent | 3dfc05c2e84923bc0aef5256d227f566aaa37868 (diff) | |
EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1232 FIX -- Create class to load and hold all of the command meta data associated with FUI toolbar actions
* Added basic commands.xml file to define FUI-related toolbar actions. For now
a basic "avatar" and "places" button are defined.
* Added basic command manager to parse and hold strings that define potential
toolbar command actions.
* Broke out a separate floater function as a placeholder for the 3-state toolbar
floater toggling.
* LLUI::initClass now parses the new commands.xml file
Reviewed by Richard.
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 4d83ec2902..598e39730c 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -125,6 +125,9 @@ with the same filename but different name <texture name="Checkbox_Press" file_name="widgets/Checkbox_Press.png" preload="true" /> <texture name="Check_Mark" file_name="icons/check_mark" preload="true" /> + <texture name="Command_Avatar_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Places_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="ComboButton_Disabled" file_name="widgets/ComboButton_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="ComboButton_UpSelected" file_name="widgets/ComboButton_UpSelected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c0154ae9b3..3b986664db 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3651,4 +3651,10 @@ Try enclosing path to the editor with double quotes. <string name="BeaconMedia">Viewing media beacons (white)</string> <string name="ParticleHiding">Hiding Particles</string> - </strings> + <!-- commands --> + <string name="Command_Avatar_Label">Avatar</string> + <string name="Command_Avatar_Tooltip">Customize your avatar</string> + <string name="Command_Places_Label">Places</string> + <string name="Command_Places_Tooltip">Destination guide</string> + +</strings> |