diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:25:02 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:25:02 -0400 |
| commit | 9c995e2a5ce45cc912605d077d704fa76ed904dd (patch) | |
| tree | 2f790ce33f92bff08ee64c45cfee4ad8ea62f4a5 /indra/newview/llappviewer.cpp | |
| parent | 853231580aa2a6bf2894c20495c549a9d5f3c673 (diff) | |
| parent | 81676d4753a1abe347a69a95f234a005aad0659f (diff) | |
merge up from viewer-development (with changes for storm-160 backed out)
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 549c6a0d76..59117aca4b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2465,6 +2465,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")) { // |