diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-09-22 13:01:30 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-09-22 13:01:30 -0700 |
| commit | 29596be514d361c71273629677bcb4c7052a6036 (patch) | |
| tree | f97117c4ddb92ef73c6b2b9436f0eb502b5e3315 | |
| parent | 2a37a8b1cc8796e4c86786017414f919dbaa6fac (diff) | |
Test disabling a couple of the display_startup() calls as an experiment.
| -rwxr-xr-x | indra/newview/llstartup.cpp | 4 | ||||
| -rwxr-xr-x | indra/viewer_components/login/lllogin.cpp | 25 |
2 files changed, 4 insertions, 25 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 7616f65a29..60d67be9ef 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -752,10 +752,10 @@ bool idle_startup() // Make sure the process dialog doesn't hide things display_startup(); gViewerWindow->setShowProgress(FALSE); - display_startup(); +// display_startup(); // Show the login dialog login_show(); - display_startup(); +// display_startup(); // connect dialog is already shown, so fill in the names if (gUserCredential.notNull()) { diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp index b361bbb276..53d4acc9e0 100755 --- a/indra/viewer_components/login/lllogin.cpp +++ b/indra/viewer_components/login/lllogin.cpp @@ -310,29 +310,8 @@ LLEventPump& LLLogin::getEventPump() // The list associates to event with the original idle_startup() 'STATE'. -// Rewrite URIs - // State_LOGIN_AUTH_INIT -// Given a vector of login uris (usually just one), perform a dns lookup for the -// SRV record from each URI. I think this is used to distribute login requests to -// a single URI to multiple hosts. -// This is currently a synchronous action. (See LLSRV::rewriteURI() implementation) -// On dns lookup error the output uris == the input uris. -// -// Input: A vector of login uris -// Output: A vector of login uris -// -// Code: -// std::vector<std::string> uris; -// LLViewerLogin::getInstance()->getLoginURIs(uris); -// std::vector<std::string>::const_iterator iter, end; -// for (iter = uris.begin(), end = uris.end(); iter != end; ++iter) -// { -// std::vector<std::string> rewritten; -// rewritten = LLSRV::rewriteURI(*iter); -// sAuthUris.insert(sAuthUris.end(), -// rewritten.begin(), rewritten.end()); -// } -// sAuthUriNum = 0; +// Setup login +// State_LOGIN_AUTH_INIT // Authenticate // STATE_LOGIN_AUTHENTICATE |