diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-09 14:41:50 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-09 14:41:50 -0800 |
| commit | 4f58b4088a469d907eb33f1e338569016ba4c1f1 (patch) | |
| tree | 0931835f84ea4bc20bc2489597ab8d55a6804222 /indra/newview/skins | |
| parent | 5790565ec6a2885fbe494c04c687e98cabf514a6 (diff) | |
CHUI-517: Altering the behavior and copy of the main menu status choices. Busy has been replaced with Do Not Disturb. And both status options have been switched to be indicated with a check rather than alternating text.
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 37 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 6 |
2 files changed, 24 insertions, 19 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index f6a307d9d0..b1e3a2d41f 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -130,19 +130,22 @@ label="Status" name="Status" tear_off="true"> - <menu_item_call - label="Away" - name="Set Away"> - <menu_item_call.on_click + <menu_item_check + label="Away"> + <menu_item_check.on_check + function="View.Status.CheckAway" /> + <menu_item_check.on_click function="World.SetAway" /> - </menu_item_call> - <menu_item_call - label="Busy" - name="set_do_not_disturb"> - <menu_item_call.on_click + </menu_item_check> + <menu_item_check + label="Do Not Disturb"> + <menu_item_check.on_check + function="View.Status.CheckDoNotDisturb" /> + <menu_item_check.on_click function="World.SetDoNotDisturb"/> - </menu_item_call> - </menu> + </menu_item_check> + + </menu> <menu_item_separator/> @@ -254,8 +257,7 @@ parameter="speak" /> </menu_item_check> <menu_item_check - label="Conversations Log..." - name="ConversationsLog"> + label="Conversation Log..."> <menu_item_check.on_check function="Floater.Visible" parameter="conversation" /> @@ -318,6 +320,15 @@ function="SideTray.PanelPeopleTab" parameter="blocked_panel" /> </menu_item_call> + <menu_item_separator/> + <menu_item_check + label="Do Not Disturb"> + <menu_item_check.on_check + function="View.Status.CheckDoNotDisturb" /> + <menu_item_check.on_click + function="World.SetDoNotDisturb"/> + </menu_item_check> + </menu> <menu create_jump_keys="true" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 04b6326769..f873bfe6c7 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2074,12 +2074,6 @@ For AI Character: Get the closest navigable point to the point provided. </string> - <!-- Avatar busy/away mode --> - <string name="AvatarSetNotAway">Not Away</string> - <string name="AvatarSetAway">Away</string> - <string name="AvatarSetAvailable">Not Busy</string> - <string name="AvatarSetDoNotDisturb">Busy</string> - <!-- Wearable Types --> <string name="shape">Shape</string> <string name="skin">Skin</string> |