diff --git a/doc/contributions.txt b/doc/contributions.txt index f2f1d5af3fa1d69624bfdbce4bd69463489e6a3a..9267d7ab088ea9dc8a7e64842b90e605d53abf25 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -151,6 +151,7 @@ blino Nakamura Boroondas Gupte SNOW-278 SNOW-527 + SNOW-624 VWR-233 WEB-262 Bulli Schumann diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp index 3f9e25518a0ed1a18f7e9622b2f3992d45d1a993..ee8646aad0bcf6c7de0e1fa1b25603615a925f89 100644 --- a/indra/newview/llcommandlineparser.cpp +++ b/indra/newview/llcommandlineparser.cpp @@ -53,7 +53,7 @@ namespace po = boost::program_options; -// *NTOE:MEP - Currently the boost object reside in file scope. +// *NOTE:MEP - Currently the boost object reside in file scope. // This has a couple of negatives, they are always around and // there can be only one instance of each. // The plus is that the boost-ly-ness of this implementation is @@ -156,6 +156,12 @@ class LLCLPValue : public po::value_semantic_codecvt_helper<char> return mIsComposing; } + // Needed for boost 1.42 + virtual bool is_required() const + { + return false; // All our command line options are optional. + } + virtual bool apply_default(boost::any& value_store) const { return false; // No defaults. @@ -169,7 +175,6 @@ class LLCLPValue : public po::value_semantic_codecvt_helper<char> { mNotifyCallback(*value); } - } protected: