diff options
| author | James Cook <james@lindenlab.com> | 2009-11-03 12:24:51 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-03 12:24:51 -0800 |
| commit | 6ec038c0cad54f36d89678df63ae7526f5fb5bca (patch) | |
| tree | 5dac3420eb2e4988011a46709ae671572e6b083b /indra/newview/llstartup.cpp | |
| parent | e87975284e2b50c81d95bbb9672678ae262288be (diff) | |
| parent | f75ce16477af31c2df1d79bcb492ae43c3b380e8 (diff) | |
merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 9aa74e8b9f..9bdea57491 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -738,7 +738,7 @@ bool idle_startup() } if (!gLoginHandler.getFirstName().empty() || !gLoginHandler.getLastName().empty() - || !gLoginHandler.getWebLoginKey().isNull() ) + /*|| !gLoginHandler.getWebLoginKey().isNull()*/ ) { // We have at least some login information on a SLURL gFirstname = gLoginHandler.getFirstName(); @@ -895,13 +895,9 @@ bool idle_startup() gViewerWindow->moveProgressViewToFront(); //reset the values that could have come in from a slurl - if (!gLoginHandler.getWebLoginKey().isNull()) - { - gFirstname = gLoginHandler.getFirstName(); - gLastname = gLoginHandler.getLastName(); -// gWebLoginKey = gLoginHandler.getWebLoginKey(); - } - + gFirstname = gLoginHandler.getFirstName(); + gLastname = gLoginHandler.getLastName(); + if (show_connect_box) { // TODO if not use viewer auth |