Moved connecting to region failed error to notifications.xml

2 files changed, 10 insertions, 3 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 30e299a..4e8da34 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2105,9 +2105,7 @@ bool idle_startup()
                         // Bounce back to the login screen -- MC
                         LL_WARNS("AppInit") << "Bad login - can't connect to this region for some reason" << LL_ENDL;
                         LLStartUp::setLoginFailed(true);
-                        LLSD args;
-                        args["ERROR_MESSAGE"] = "Unable to connect to the current region. Try logging into a different region instead. The default login location can be set in the General tab in Preferences.";
-                        LLNotifications::instance().add("ErrorMessage", args, LLSD(), login_alert_done);
+                        LLNotifications::instance().add("ConnectingToRegionError", LLSD(), LLSD(), login_alert_done);
                         LLStartUp::resetLogin();
                         gSavedSettings.setBOOL("AutoLogin", FALSE);
                         //this might be redundant
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index f7f8e7e..5677073 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6849,6 +6849,15 @@ Are you sure you want to teleport home?
 
 <notification
  icon="alertmodal.tga"
+ name="ConnectingToRegionError"
+ type="alertmodal">
+Unable to connect to the current region. Try logging into a different region instead. 
+
+The default login location can be set in the General tab in Preferences.
+</notification>
+
+<notification
+ icon="alertmodal.tga"
  name="DisconnectedFromRegion"
  type="alertmodal">
 You have been disconnected from the region you were in. Unable to continue.