diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-03-05 11:11:54 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-03-05 11:11:54 -0800 |
| commit | 89b48796271f48c8b89e7981095bed4acf825a0f (patch) | |
| tree | 480703ed1c3bace62699f33ccbdcba705124fc16 /indra/newview/skins | |
| parent | 8164dce567d1bd59a1de3f488b01783a5ab69ed4 (diff) | |
| parent | dd74c2cbd542daa8d6cedba7ba7a68268f7b73d3 (diff) | |
Merge remote-tracking branch 'origin/release/gltf-maint2' into release/materials_featurette
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 1d012cd348..4719b091ab 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2717,6 +2717,12 @@ function="World.EnvPreset" function="Advanced.ForceErrorLlerror" /> </menu_item_call> <menu_item_call + label="Force LLError, Message And Crash" + name="Force LLError And Crash"> + <menu_item_call.on_click + function="Advanced.ForceErrorLlerrorMsg" /> + </menu_item_call> + <menu_item_call label="Force Bad Memory Access" name="Force Bad Memory Access"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f3b26820d2..7360c06f86 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3019,8 +3019,19 @@ Running in window. If you continue to receive this message, contact the [SUPPORT_SITE]. </string> + <string name="MBOutOfMemoryTitle">Out Of Memory</string> + <string name="MBOutOfMemoryErr"> + [APP_NAME]'s request for memory failed. Application can't proceed and will be closed. - <!-- Avatar Shape Information --> +If your computer's RAM is low, quit any heavy applications before runing Second Life, allocate a page file or reduce graphical settings like draw distance. + </string> + <string name="MBMissingFile"> + [APP_NAME] couldn't access or find some of the files it needs and will be closed. + +Please reinstall viewer from https://secondlife.com/support/downloads/ and contact https://support.secondlife.com if issue persists after reinstall. + </string> + + <!-- Avatar Shape Information --> <string name="5 O'Clock Shadow">5 O'Clock Shadow</string> <string name="All White">All White</string> |