diff options
author | McCabe Maxsted | 2010-06-16 01:39:09 -0700 |
---|---|---|
committer | Jacek Antonelli | 2010-06-19 02:43:39 -0500 |
commit | 676888a3efeceb8530172392c6fa058891997169 (patch) | |
tree | 3a49281ae41000581f4d631fe2ca02a6c4bfb25c /linden/indra/newview/llstartup.cpp | |
parent | Fixed #338: addRegion/removeRegion can trigger a viewer quit (diff) | |
download | meta-impy-676888a3efeceb8530172392c6fa058891997169.zip meta-impy-676888a3efeceb8530172392c6fa058891997169.tar.gz meta-impy-676888a3efeceb8530172392c6fa058891997169.tar.bz2 meta-impy-676888a3efeceb8530172392c6fa058891997169.tar.xz |
Moved connecting to region failed error to notifications.xml
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 4 |
1 files changed, 1 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() | |||
2105 | // Bounce back to the login screen -- MC | 2105 | // Bounce back to the login screen -- MC |
2106 | LL_WARNS("AppInit") << "Bad login - can't connect to this region for some reason" << LL_ENDL; | 2106 | LL_WARNS("AppInit") << "Bad login - can't connect to this region for some reason" << LL_ENDL; |
2107 | LLStartUp::setLoginFailed(true); | 2107 | LLStartUp::setLoginFailed(true); |
2108 | LLSD args; | 2108 | LLNotifications::instance().add("ConnectingToRegionError", LLSD(), LLSD(), login_alert_done); |
2109 | 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."; | ||
2110 | LLNotifications::instance().add("ErrorMessage", args, LLSD(), login_alert_done); | ||
2111 | LLStartUp::resetLogin(); | 2109 | LLStartUp::resetLogin(); |
2112 | gSavedSettings.setBOOL("AutoLogin", FALSE); | 2110 | gSavedSettings.setBOOL("AutoLogin", FALSE); |
2113 | //this might be redundant | 2111 | //this might be redundant |