From cec06ebd632fd8338e66bf9a497a92b36e9c7074 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 11 Jul 2017 17:46:29 -0400
Subject: MAINT-7592 (update): fix ToS cancel alert and leftover xml comment
 terminator

---
 indra/newview/skins/default/xui/en/floater_tos.xml   | 1 -
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 9b97df1af3..e3b49bf917 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -95,5 +95,4 @@
      name="Cancel"
      top_delta="0"
      width="100" />
--->
 </floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8620c09f9a..13c2bca444 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1293,7 +1293,7 @@ There was a problem uploading a report screenshot due to the following reason: [
    name="MustAgreeToLogIn"
    type="alertmodal">
    <tag>fail</tag>
-You must agree to the Terms of Service to continue logging into [SECOND_LIFE].
+You must agree to the Second Life Terms and Conditions, Privacy Policy, and Terms of Service to continue logging into [SECOND_LIFE].
   </notification>
 
   <notification
-- 
cgit v1.2.3