diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-04-21 11:44:48 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-04-21 11:44:48 -0700 |
| commit | 77791a88a9811f71cc9af668d28a903645436be0 (patch) | |
| tree | a3327810a1e9ac57681e9cf0fdc627dcd168a0a9 /indra/newview/llappviewer.cpp | |
| parent | 970b3a7f28c2f1a611410cb8738d17800949b1bd (diff) | |
| parent | da3c0658de4b6e7ab645b718927e9b10fd612b01 (diff) | |
Merge madness
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")) { // |