summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2017-09-28 16:13:44 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2017-09-28 16:13:44 +0300
commitd8dd2e7899e678781d4865cd52b2c3f1a7699924 (patch)
treee7d9fa1b9f67da5ddb644aee3a53da9f8abf7e72 /indra/newview/llstartup.cpp
parent36c991877f128bfb76e1b6d476d7f49956c0d87f (diff)
MAINT-7835 Start location is not changed correctly via 'maps.secondlife.com' link in some cases
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 8295ce029b..df1d2a3946 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -766,7 +766,7 @@ bool idle_startup()
// Show the login dialog
login_show();
// connect dialog is already shown, so fill in the names
- if (gUserCredential.notNull())
+ if (gUserCredential.notNull() && !LLPanelLogin::isCredentialSet())
{
LLPanelLogin::setFields( gUserCredential, gRememberPassword);
}