merge changes for STORM-2099

2015-01-06 11:16:17 -05:00 · 2015-01-06 11:16:17 -05:00 · 0e5dbc4ef8
parent 7205dbdbe4 4c96feb0e5
commit 0e5dbc4ef8
2 changed files with 4 additions and 2 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -722,6 +722,7 @@ Jonathan Yap
 	STORM-2034
 	STORM-2018
 	STORM-2086
+	STORM-2099
 Kadah Coba
 	STORM-1060
    STORM-1843
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@ -2463,8 +2463,9 @@ This is usually a temporary failure. Please customize and save the wearable agai
   icon="alertmodal.tga"
   name="YouHaveBeenLoggedOut"
   type="alertmodal">
-Darn. You have been logged out of [SECOND_LIFE]
-            [MESSAGE]
+Darn. You have been logged out of [SECOND_LIFE].
+
+[MESSAGE]
    <usetemplate
     name="okcancelbuttons"
     notext="Quit"