diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-07-12 14:03:10 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-07-12 14:03:10 +0300 |
| commit | d5a2a71327537393b0c97eed2a575eb7f47759f6 (patch) | |
| tree | 0568a89056a7a3e6eabb794f4163c4d935c5bbb2 | |
| parent | 44ec155b85b50310dfbb347721ae144687361851 (diff) | |
| parent | cec06ebd632fd8338e66bf9a497a92b36e9c7074 (diff) | |
Merged in oz_linden/maint-7592
| -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 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 |