summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 98c9ec868a..3c66f99e6a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4495,7 +4495,7 @@ Link to this from a web page to give others easy access to this location, or try
icon="alertmodal.tga"
name="GraphicsPreferencesHelp"
type="alertmodal">
-This panel controls window size and resolution and the quality of the client's graphics. The Preferences > Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by checking the Custom checkbox and manipulating the following settings:
+This panel controls window size and resolution and the quality of the client's graphics. The Preferences > Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by clicking the Advanced button and manipulating the following settings:
Shaders: Enable or disable various types of pixel shaders.
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 95d8d2ce2a..70292a38aa 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -260,7 +260,7 @@
label="Show my name"
layout="topleft"
left_delta="0"
- name="show_my_name_checkbox"
+ name="show_my_name_checkbox1"
top_pad="5"
width="300" />
<check_box
@@ -280,7 +280,7 @@
label="Show group titles"
layout="topleft"
left_delta="-175"
- name="show_all_title_checkbox"
+ name="show_all_title_checkbox1"
top_pad="5"
width="300" />
<text