summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/menu_viewer.xml
diff options
context:
space:
mode:
authorHoward Stearns <aech@lindenlab.com>2022-05-12 17:09:30 +0000
committerHoward Stearns <aech@lindenlab.com>2022-05-12 17:09:30 +0000
commit44f70be1e447664ec3ee050e85a8e14965fff4e7 (patch)
treec1a5c851a06dd77a27cbc135e4625701e743902e /indra/newview/skins/default/xui/en/menu_viewer.xml
parent4cfcbca748e825b4904e7f136fa625b1a0f79dfb (diff)
parent915de3eb556c22216fd3c76e2de4a2ab1953dbe0 (diff)
Merged DRTVWR-544-maint into SL-12238
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml16
1 files changed, 12 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8d7cfe1116..1801ccd432 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -423,7 +423,9 @@
</menu_item_call>
<menu_item_call
label="Stop animations"
- name="Stop Animating My Avatar">
+ name="Stop Animating My Avatar"
+ allow_key_repeat="true"
+ shortcut="alt|shift|A">
<menu_item_call.on_click
function="Tools.StopAllAnimations" />
</menu_item_call>
@@ -2647,6 +2649,12 @@ function="World.EnvPreset"
function="Advanced.ForceErrorBadMemoryAccess" />
</menu_item_call>
<menu_item_call
+ label="Force Bad Memory Access in Coroutine"
+ name="Force Bad Memory Access in Coroutine">
+ <menu_item_call.on_click
+ function="Advanced.ForceErrorBadMemoryAccessCoro" />
+ </menu_item_call>
+ <menu_item_call
label="Force Infinite Loop"
name="Force Infinite Loop">
<menu_item_call.on_click
@@ -2665,10 +2673,10 @@ function="World.EnvPreset"
function="Advanced.ForceErrorSoftwareException" />
</menu_item_call>
<menu_item_call
- label="Force a Crash in a Coroutine"
- name="Force a Crash in a Coroutine">
+ label="Force Software Exception in Coroutine"
+ name="Force Software Exception in Coroutine">
<menu_item_call.on_click
- function="Advanced.ForceErrorCoroutineCrash" />
+ function="Advanced.ForceErrorSoftwareExceptionCoro" />
</menu_item_call>
<menu_item_call
label="Force a Crash in a Thread"