diff options
| author | Tofu Buzzard <no-email> | 2010-11-27 13:08:00 +0000 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-11-27 13:08:00 +0000 |
| commit | 31a109452d743af565f99029ec835e2f32261681 (patch) | |
| tree | 07375d9174730e1deec3aedcc6333fe8426cd827 /indra/newview/tests/llviewerhelputil_test.cpp | |
| parent | b3541777921142572f735c4b028e4fba91ae80a0 (diff) | |
| parent | 2f83766bb71772eda19a4c7c61896c0fd7fae8a4 (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, |