summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml6
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml14
2 files changed, 18 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e78670126e..d580369ab2 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2725,6 +2725,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 9fb29c772f..b1feb7368f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -53,7 +53,6 @@ Draw distance: [DRAW_DISTANCE]m
Bandwidth: [NET_BANDWITH]kbit/s
LOD factor: [LOD_FACTOR]
Render quality: [RENDER_QUALITY]
-Advanced Lighting Model: [GPU_SHADERS]
Texture memory: [TEXTURE_MEMORY]MB
Disk cache: [DISK_CACHE_INFO]
</string>
@@ -3020,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>