diff options
| author | Graham Linden <graham@lindenlab.com> | 2014-05-29 04:54:58 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2014-05-29 04:54:58 -0700 |
| commit | a815ad481add3dea3f67f1c1c579ddb99d9a9f48 (patch) | |
| tree | e3cf5b5b77246e8cf4917e613cbffe7e414be63c /indra/llcommon/llapp.h | |
| parent | b703a612d7ca96e9c79f40a33208757bba6e9d7e (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Mergeup to 3.7.9 viewer-release
Diffstat (limited to 'indra/llcommon/llapp.h')
| -rwxr-xr-x | indra/llcommon/llapp.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index 3f7bf2ca47..d9933b3d36 100755 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -30,7 +30,6 @@ #include <map> #include "llrun.h" #include "llsd.h" -#include "lloptioninterface.h" // Forward declarations template <typename Type> class LLAtomic32; typedef LLAtomic32<U32> LLAtomicU32; @@ -55,7 +54,7 @@ namespace google_breakpad { class ExceptionHandler; // See exception_handler.h } -class LL_COMMON_API LLApp : public LLOptionInterface +class LL_COMMON_API LLApp { friend class LLErrorThread; public: @@ -104,7 +103,7 @@ public: * @param name The name of the option. * @return Returns the option data. */ - virtual LLSD getOption(const std::string& name) const; + LLSD getOption(const std::string& name) const; /** * @brief Parse command line options and insert them into |