summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-10-01 14:09:12 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-11-30 01:19:43 +0200
commitef0b48ce5a918d30e4303c7b6eebec69c21ab8cf (patch)
tree87780a033d402dcf8a27b3cc82d553c7aa9fcec6 /indra/newview/skins/default
parent850767eb214371737970aad00c9b3e8103f98b32 (diff)
SL-16119 Viewer should now direct IM 2 Email setting to web
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml24
2 files changed, 14 insertions, 16 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index ee730dcb01..c4adf0409d 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -11,12 +11,6 @@
single_instance="true"
title="PREFERENCES"
width="658">
- <floater.string
- name="email_unverified_tooltip">
- Please verify your email to enable IM to Email by visiting
-https://accounts.secondlife.com/change_email/
- </floater.string>
-
<button
follows="right|bottom"
height="23"
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..fee745aca3 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 Open email notification settings]
+ </text>
+
+ <text
layout="topleft"
left="345"
height="12"