summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/commands.xml
diff options
context:
space:
mode:
authorCallum Prentice <callum@gmail.com>2017-04-21 14:32:13 -0700
committerCallum Prentice <callum@gmail.com>2017-04-21 14:32:13 -0700
commit2a5c47eb083a55cccb60916263b3c2b5d8d9c4fe (patch)
treeec40f2091563c690e06fb16d54b84d0e65bef39a /indra/newview/app_settings/commands.xml
parent8846f9c7c19f85118da7d5601ad1dd14e491b6f5 (diff)
parent5f6bcaf456469f07d23a5599a1fed59420fd6ae7 (diff)
Automated merge with tip of viewer64 (after it was merged with viewer-release)
Diffstat (limited to 'indra/newview/app_settings/commands.xml')
-rw-r--r--indra/newview/app_settings/commands.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 9bc0a7c701..412d3a53b3 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -292,4 +292,15 @@
is_running_function="Floater.IsOpen"
is_running_parameters="reporter"
/>
+ <command name="gridstatus"
+ available_in_toybox="true"
+ is_flashing_allowed="true"
+ icon="Command_Grid_Status_Icon"
+ label_ref="Command_Grid_Status_Label"
+ tooltip_ref="Command_Grid_Status_Tooltip"
+ execute_function="Floater.ToggleOrBringToFront"
+ execute_parameters="grid_status"
+ is_running_function="Floater.IsOpen"
+ is_running_parameters="grid_status"
+ />
</commands>