From 526087d9ab6f1fb24e8808a6bef83e26fe6da857 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 4 Oct 2017 12:43:53 -0700
Subject: MAINT-7468: Show tooltip on disabled IM to Email if unverified email.

---
 indra/newview/llfloaterpreference.cpp                      | 7 +++++++
 indra/newview/skins/default/xui/en/floater_preferences.xml | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index e369403e22..5222637039 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1856,6 +1856,13 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im
 	getChild<LLUICtrl>("online_visibility")->setValue(mOriginalHideOnlineStatus); 	 
 	getChild<LLUICtrl>("online_visibility")->setLabelArg("[DIR_VIS]", mDirectoryVisibility);
 	getChildView("send_im_to_email")->setEnabled(is_verified_email);
+
+    std::string tooltip;
+    if (!is_verified_email)
+        tooltip = getString("email_unverified_tooltip");
+
+    getChildView("send_im_to_email")->setToolTip(tooltip);
+
     // *TODO: Show or hide verify email text here based on is_verified_email
     getChild<LLUICtrl>("send_im_to_email")->setValue(im_via_email);
 	getChildView("favorites_on_login_check")->setEnabled(TRUE);
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 5ca527ad20..845c1efe4d 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -11,6 +11,12 @@
  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"
-- 
cgit v1.2.3