From 73b39c9b46ed25ae03b8225758c15325e50fdfe2 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 13 Oct 2010 18:41:35 -0700 Subject: made destination guide url configurable on command line --- indra/newview/llcommandlineparser.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llcommandlineparser.cpp') diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp index ee8646aad0..0b59f8bd4b 100644 --- a/indra/newview/llcommandlineparser.cpp +++ b/indra/newview/llcommandlineparser.cpp @@ -341,7 +341,10 @@ bool LLCommandLineParser::parseCommandLine(int argc, char **argv) bool LLCommandLineParser::parseCommandLineString(const std::string& str) { // Split the string content into tokens - boost::escaped_list_separator sep("\\", "\r\n ", "\"'"); + const char* escape_chars = "\\"; + const char* separator_chars = "\r\n "; + const char* quote_chars = "\"'"; + boost::escaped_list_separator sep(escape_chars, separator_chars, quote_chars); boost::tokenizer< boost::escaped_list_separator > tok(str, sep); std::vector tokens; // std::copy(tok.begin(), tok.end(), std::back_inserter(tokens)); -- cgit v1.2.3 From 0f1d345e187c031ead1199c29674e93d922496cc Mon Sep 17 00:00:00 2001 From: "Boroondas Gupte (original fix by Aleric Inglewood)" Date: Sat, 16 Oct 2010 18:24:52 +0200 Subject: VWR-23459 FIXED Viewer compiled against Boost-1.42 crashes when certain command line options are given used Aleric's SG2 changeset from http://svn.secondlife.com/trac/linden/changeset/3600 patching file doc/contributions.txt Hunk #1 succeeded at 73 with fuzz 2. patching file indra/newview/llcommandlineparser.cpp Hunk #1 succeeded at 268 with fuzz 1 (offset -8 lines). Edited doc/contributions.txt to create an entry for Aleric and moved the issue ID there (patch wasn't able to place it at the right position, lacking any context). --- indra/newview/llcommandlineparser.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/llcommandlineparser.cpp') diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp index 2f99ca1247..c7359a8865 100644 --- a/indra/newview/llcommandlineparser.cpp +++ b/indra/newview/llcommandlineparser.cpp @@ -267,7 +267,11 @@ bool 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); po::basic_parsed_options opts = clp.run(); po::store(opts, gVariableMap); -- cgit v1.2.3