diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-07-11 17:47:32 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-07-11 17:47:32 -0400 |
| commit | 2ab0db467a4b0edc36043aaa6b7c24c0c772900a (patch) | |
| tree | 2e04554a31ec57285723d332e7762ee621872850 /indra/newview | |
| parent | 83cda57b10e1416f2d104941f862f598653c42cb (diff) | |
| parent | cec06ebd632fd8338e66bf9a497a92b36e9c7074 (diff) | |
merge changes for MAINT-7592
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tos.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 2 |
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 53d3e0c398..4db272ba3f 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 |