diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-21 10:58:23 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-21 10:58:23 -0400 |
| commit | ae5cf3cefaf6bf25f4478611505cbd58c5a3b112 (patch) | |
| tree | 5d6d6cf3bb925050232e2e28b7e5526963a5c3fc /indra/newview/llcommandlineparser.cpp | |
| parent | 7c06c9a3d1769758f5e01662d4e546178b490408 (diff) | |
| parent | 71f56a2bc9697989cd012adb57abdc922aa8ae0a (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llcommandlineparser.cpp')
| -rw-r--r-- | indra/newview/llcommandlineparser.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp index 3f9e25518a..fb3db94c25 100644 --- a/indra/newview/llcommandlineparser.cpp +++ b/indra/newview/llcommandlineparser.cpp @@ -262,7 +262,11 @@ bool LLCommandLineParser::parseAndStoreResults(po::command_line_parser& clp) { clp.options(gOptionsDesc); clp.positional(gPositionalOptions); - clp.style(po::command_line_style::default_style + // SNOW-626: Boost 1.42 erroneously added allow_guessing to the default style + // (see http://groups.google.com/group/boost-list/browse_thread/thread/545d7bf98ff9bb16?fwc=2&pli=1) + // Remove allow_guessing from the default style, because that is not allowed + // when we have options that are a prefix of other options (aka, --help and --helperuri). + clp.style((po::command_line_style::default_style & ~po::command_line_style::allow_guessing) | po::command_line_style::allow_long_disguise); if(mExtraParser) { |