summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-07-11 17:46:29 -0400
committerOz Linden <oz@lindenlab.com>2017-07-11 17:46:29 -0400
commitcec06ebd632fd8338e66bf9a497a92b36e9c7074 (patch)
treee99555cc1c744f8cc0d9cf2baaa2f28fb59f10a0 /indra/newview
parentd4974cdff93b774871395bcaf97753c0b348622a (diff)
MAINT-7592 (update): fix ToS cancel alert and leftover xml comment terminator
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/floater_tos.xml1
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml2
2 files changed, 1 insertions, 2 deletions
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