diff options
author | Callum Prentice <callum@lindenlab.com> | 2021-06-07 18:55:00 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2021-06-07 18:55:00 -0700 |
commit | ad9ed0a94dfd37878b35b70e0a365017a1e548bf (patch) | |
tree | a86bee1eba9cd8c40c1408abf067e3f8f673a33f /indra/newview/skins/default/xui | |
parent | ac8640d338997020ca0650001ff004e1103ac5cb (diff) | |
parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) |
Merge with tip of Master after Viewer release
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml | 8 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index e282f1b179..3cc99b28c9 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml @@ -724,6 +724,14 @@ name="Reflections" width="150"> <combo_box.item + label="None; opaque" + name="0" + value="-2"/> + <combo_box.item + label="None; transparent" + name="0" + value="-1"/> + <combo_box.item label="Minimal" name="0" value="0"/> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index a1c73d12d0..cc0dc5c3cc 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -9588,6 +9588,12 @@ You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_ If you continue to have problems, please visit the [SUPPORT_SITE]. </global> + <global name="UnsupportedIntelDriver"> +The installed Intel graphics driver for [GPUNAME], version [VERSION], is significantly out of date and is known to cause excessive rates of program crashes. You are strongly advised to update to a current Intel driver + +Do you want to check the Intel driver website? + </global> + <global name="UnsupportedCPUAmount"> 796 </global> |