summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llstartup.cpp4
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml13
2 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index e20d714a3b..42bb267b33 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1188,6 +1188,10 @@ bool idle_startup()
}
}
+ else if (reason_response == "BadType")
+ {
+ LLNotificationsUtil::add("LoginFailedToParse", LLSD(), LLSD(), login_alert_done);
+ }
else if (!message.empty())
{
// This wasn't a certificate error, so throw up the normal
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b769d20106..756bb52e3e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -214,6 +214,19 @@ Make sure your Internet connection is working properly.
<notification
icon="alertmodal.tga"
+ name="LoginFailedToParse"
+ type="alertmodal">
+ <tag>fail</tag>
+Viewer received malformed response from server. Please, make sure your Internet connection is working properly and try again later.
+
+If you feel this is in error, please contact Support.
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="MessageTemplateNotFound"
type="alertmodal">
Message Template [PATH] not found.