diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-15 14:59:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-15 14:59:25 -0400 |
| commit | 67eb368bb2fa7090e8ec3a6ac24548589c8cb2f2 (patch) | |
| tree | d37986378631c6de4a1defb74a3df7867b201832 /indra/newview | |
| parent | 572e491acf2d9ca1701ec54df31632cbc9c253c8 (diff) | |
| parent | 6f64469cddf8683e80c251ce543e54a18d98d258 (diff) | |
merge changes for storm-1083
Diffstat (limited to 'indra/newview')
| -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 cbd996f909..061ef7268e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2467,6 +2467,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")) { // |