diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-11-29 17:21:12 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-11-29 17:21:12 -0500 |
| commit | b6dc4a4bf18e79ac4b67a5bac48aab15ef27f50a (patch) | |
| tree | 3f2ccf61d331880e6fc7387efa92ad5586ecbd35 /indra/newview | |
| parent | 32d496e472d1b49b713832c9d239334cf6288542 (diff) | |
| parent | 94770bbb3f8684c1cfa62f9a4f83cc70e4d7ef8f (diff) | |
Automated merge with https://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llcommandlineparser.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp index fb3db94c25..f31ff14df6 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 @@ public: 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 @@ public: { mNotifyCallback(*value); } - } protected: |