diff options
author | Dave Parks <davep@lindenlab.com> | 2010-12-02 21:34:01 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-12-02 21:34:01 -0600 |
commit | 98802a1ef99b7e5fb586dc259118fd58dc34631a (patch) | |
tree | 51e183db55f7c3dfbc60bcc4ab09e700d8f7f51a /indra/newview/tests/llviewerhelputil_test.cpp | |
parent | 0be7fcf2a95a6d885bbef583966757d12fc9d18c (diff) | |
parent | 680328dd78e1d31a2f8836919a0f6140a76af5f4 (diff) |
Merge
Diffstat (limited to 'indra/newview/tests/llviewerhelputil_test.cpp')
-rw-r--r-- | indra/newview/tests/llviewerhelputil_test.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp index a0f1d1c3c3..b425b50c8b 100644 --- a/indra/newview/tests/llviewerhelputil_test.cpp +++ b/indra/newview/tests/llviewerhelputil_test.cpp @@ -72,16 +72,13 @@ static void substitute_string(std::string &input, const std::string &search, con } } -class LLAgent -{ -public: - LLAgent() {} - ~LLAgent() {} -#ifdef __GNUC__ - __attribute__ ((noinline)) -#endif - bool isGodlike() const { return FALSE; } -}; +#include "../llagent.h" +LLAgent::LLAgent() : mAgentAccess(gSavedSettings) { } +LLAgent::~LLAgent() { } +bool LLAgent::isGodlike() const { return FALSE; } +LLAgentAccess::LLAgentAccess(LLControlGroup& settings) : mSavedSettings(settings) { } +LLUIColor::LLUIColor() {} + LLAgent gAgent; std::string LLWeb::expandURLSubstitutions(const std::string &url, |