summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-10-11 15:16:45 -0700
committerMerov Linden <merov@lindenlab.com>2011-10-11 15:16:45 -0700
commit682609d254fb973cfa267923b69c5e06b7efd7e1 (patch)
tree0063e23841b6e3bb588355ad428608bb1f4fcdf9 /indra/newview/app_settings
parent3596c0f7e139724f31258ffb96157146aeba77b1 (diff)
parentc1a9ca33b27f4e741eeacf781a09156009167ad3 (diff)
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/commands.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 881bc22144..296d992b34 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -187,10 +187,8 @@
icon="Command_Profile_Icon"
label_ref="Command_Profile_Label"
tooltip_ref="Command_Profile_Tooltip"
- execute_function="Floater.ToolbarToggle"
- execute_parameters="my_profile"
- is_running_function="Floater.IsOpen"
- is_running_parameters="my_profile"
+ execute_function="Avatar.ToggleMyProfile"
+ is_running_function="Avatar.IsMyProfileOpen"
/>
<command name="search"
available_in_toybox="true"
@@ -219,6 +217,8 @@
tooltip_ref="Command_Speak_Tooltip"
execute_function="Agent.ToggleMicrophone"
execute_parameters="speak"
+ execute_stop_function=""
+ execute_stop_parameters="speak"
is_enabled_function="Agent.IsActionAllowed"
is_enabled_parameters="speak"
is_running_function="Agent.IsMicrophoneOn"