diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-20 19:34:02 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-20 19:34:02 -0700 |
| commit | 1aa431bca280fcd7c9b1ad2f1bc8e0e7dd7df5eb (patch) | |
| tree | 87b371c8120f17ae6cf1c27546ea87d57cfeff7b | |
| parent | cbb184d986cbdd09d36cf2b2313726f0f2582cb2 (diff) | |
| parent | 2c2cada190f03b1312ed925290a4e230088e8910 (diff) | |
STORM-424 : merge Boroondas changeset to viewer-development
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llcommandlineparser.cpp | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index bcf714b29a..195af5c0c2 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -62,6 +62,7 @@ Alejandro Rosenthal VWR-1184 Aleric Inglewood SNOW-522 + SNOW-626 SNOW-756 SNOW-764 VWR-10001 diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp index ee8646aad0..f31ff14df6 100644 --- a/indra/newview/llcommandlineparser.cpp +++ b/indra/newview/llcommandlineparser.cpp @@ -267,7 +267,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) { |