livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for MAINT-7592

master
Oz Linden 2017-07-11 17:47:32 -04:00
parent 83cda57b10 cec06ebd63
commit 2ab0db467a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/skins/default/xui/en/floater_tos.xml
View File

@ -95,5 +95,4 @@
name="Cancel"
top_delta="0"
width="100" />
-->
</floater>

2
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -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