diff options
author | Don Kjer <don@lindenlab.com> | 2011-04-19 21:50:08 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-04-19 21:50:08 +0000 |
commit | ee2cea657ad54643f19f1ced42deecd628a59e1b (patch) | |
tree | 9084b8cf909575612448424fe556c188885e5ab4 /indra/newview/llappviewer.cpp | |
parent | 7e998f5eccdbcff35a4807b92d6b8a9cb4735f14 (diff) | |
parent | b8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 90c9912d1d..5e5c0f71db 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2468,6 +2468,14 @@ bool LLAppViewer::initConfiguration() } } + // If automatic login from command line with --login switch + // init StartSLURL location. In interactive login, LLPanelLogin + // will take care of it. + if ((clp.hasOption("login") || clp.hasOption("autologin")) && !clp.hasOption("url") && !clp.hasOption("slurl")) + { + LLStartUp::setStartSLURL(LLSLURL(gSavedSettings.getString("LoginLocation"))); + } + if (!gSavedSettings.getBOOL("AllowMultipleViewers")) { // |