diff options
| author | simon <none@none> | 2013-03-25 12:19:02 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-03-25 12:19:02 -0700 |
| commit | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (patch) | |
| tree | 8d86c9060ac05b34b1a9dfd25f03451e18dcc326 /indra/newview/app_settings/commands.xml | |
| parent | cc260a635674c56d8fab88a5cd4dd188b4c9ac9c (diff) | |
| parent | 98a82c50d539451e1931826ca75fbc01d611806d (diff) | |
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
Diffstat (limited to 'indra/newview/app_settings/commands.xml')
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 73df064ab2..4659673333 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -44,13 +44,14 @@ /> <command name="chat" available_in_toybox="true" + is_flashing_allowed="true" icon="Command_Chat_Icon" label_ref="Command_Chat_Label" - tooltip_ref="Command_Chat_Tooltip" + tooltip_ref="Command_Conversations_Tooltip" execute_function="Floater.ToggleOrBringToFront" - execute_parameters="chat_bar" + execute_parameters="im_container" is_running_function="Floater.IsOpen" - is_running_parameters="chat_bar" + is_running_parameters="im_container" /> <command name="compass" available_in_toybox="false" @@ -239,14 +240,4 @@ is_running_function="Floater.IsOpen" is_running_parameters="camera" /> - <command name="voice" - available_in_toybox="true" - icon="Command_Voice_Icon" - label_ref="Command_Voice_Label" - tooltip_ref="Command_Voice_Tooltip" - execute_function="Floater.ToggleOrBringToFront" - execute_parameters="voice_controls" - is_running_function="Floater.IsOpen" - is_running_parameters="voice_controls" - /> </commands> |