summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2017-07-12 14:08:02 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2017-07-12 14:08:02 +0300
commit4ac428972459d85dd3ca9224f8d8d7616459d865 (patch)
tree95ec08940e7f68a6f38f578c98402af1ade3cbc9 /indra/newview/skins
parent4f9071c806f35564fec338682199e8c64d40fd6c (diff)
parentd5a2a71327537393b0c97eed2a575eb7f47759f6 (diff)
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/skins')
-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 afdb696cb4..71b0edb572 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