diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-04-08 20:09:45 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-04-08 20:09:45 +0300 |
| commit | 6f64469cddf8683e80c251ce543e54a18d98d258 (patch) | |
| tree | 89db726f56a8fe36946552b6191a7144e88e0c9c /indra/newview/llappviewer.cpp | |
| parent | b5c834c6fdcee7d7238bebfc561ecee3ecca3589 (diff) | |
STORM-1083 FIXED Using -login client parameter always results in a last location unavailable error message
- In case of using "login" or "autologin" command-line parameters, URL of the start location should be set during configuration initialization of application. This is because there won't be ability to set it before login state (panel login won't be shown).
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 d96e376bc7..c889aa2979 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")) { // |