summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2021-12-15 13:05:02 -0700
committerDave Houlton <euclid@lindenlab.com>2021-12-15 13:05:02 -0700
commite27f9551e1cae0f3fca22989bcbd256a876fd80d (patch)
tree0361f80565053ec2183277eeb73c6c6dbf8d06f6 /indra/newview/skins/default/xui/en/panel_preferences_chat.xml
parent101e282ca3d0e8ca0bf10b32a2a4b6362bc66b80 (diff)
parent0a873cd95547f003878c6d00d0883ff792f4a865 (diff)
DRTVWR-528 merge up to 6.5.2
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml24
1 files changed, 14 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index c023cb036e..35bd736d77 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -44,16 +44,6 @@
<check_box
enabled="false"
height="16"
- label="Email me IMs when I'm offline"
- layout="topleft"
- name="send_im_to_email"
- top_pad="6"
- width="330">
- </check_box>
-
- <check_box
- enabled="false"
- height="16"
label="Only friends and groups can call or IM me"
layout="topleft"
name="voice_call_friends_only_check"
@@ -62,6 +52,20 @@
</check_box>
<text
+ font="SansSerifSmall"
+ height="16"
+ layout="topleft"
+ length="1"
+ name="email_settings"
+ skip_link_underline="true"
+ top_pad="6"
+ left_delta="2"
+ type="string"
+ width="350">
+ [https://accounts.secondlife.com/change_email Email me IMs when I'm offline]
+ </text>
+
+ <text
layout="topleft"
left="345"
height="12"