diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-07-02 16:33:40 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-07-02 16:33:40 -0400 |
| commit | d8565b05a5ccc9df8522db1d0fb32c320fa975b9 (patch) | |
| tree | be67769325f110ab8ac898ad97979e8f39b4f68d /indra/newview/llappviewer.cpp | |
| parent | 09d8d17382c72b7741fde1334e832f39d773299f (diff) | |
CHOP-959: Introduce CmdLineChannel settings var, map --channel to it.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 3116dd4b00..37f1f11451 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2536,9 +2536,10 @@ bool LLAppViewer::initConfiguration() } } - if(clp.hasOption("channel")) - { - LLVersionInfo::resetChannel(clp.getOption("channel")[0]); + std::string CmdLineChannel(gSavedSettings.getString("CmdLineChannel")); + if(! CmdLineChannel.empty()) + { + LLVersionInfo::resetChannel(CmdLineChannel); } // If we have specified crash on startup, set the global so we'll trigger the crash at the right time |