diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-20 02:48:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-20 02:48:05 +0300 |
| commit | 6c8e6f033b6c94c9f8d6ceb5b0375665a50a69af (patch) | |
| tree | 323137947b5e318f88f9f87ad981c79af966680e /indra/newview/skins/default/xui/en/menu_viewer.xml | |
| parent | a6ea2dbedcf54b6a847d894b77777cc88698a28d (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index c550f69d26..72cce2208f 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2657,6 +2657,18 @@ 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"> + <menu_item_call.on_click + function="Advanced.ForceErrorCoroutineCrash" /> + </menu_item_call> + <menu_item_call + label="Force a Crash in a Thread" + name="Force a Crash in a Thread"> + <menu_item_call.on_click + function="Advanced.ForceErrorThreadCrash" /> + </menu_item_call> + <menu_item_call label="Force Disconnect Viewer" name="Force Disconnect Viewer"> <menu_item_call.on_click |