diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-05-12 17:08:20 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-05-12 17:08:20 -0700 |
| commit | f7a01d7b338bcd9c7ee09022a6179b3c6710237d (patch) | |
| tree | ff8b8f6b741d3b016570ef3f5809ae45ca270493 /indra/newview/tests/llviewerhelputil_test.cpp | |
| parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
| parent | 2661a4c2c9359f2c2cabce6f48704dc8fb481994 (diff) | |
Merge.
Diffstat (limited to 'indra/newview/tests/llviewerhelputil_test.cpp')
| -rw-r--r-- | indra/newview/tests/llviewerhelputil_test.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp index b425b50c8b..710881d811 100644 --- a/indra/newview/tests/llviewerhelputil_test.cpp +++ b/indra/newview/tests/llviewerhelputil_test.cpp @@ -73,11 +73,9 @@ static void substitute_string(std::string &input, const std::string &search, con } #include "../llagent.h" -LLAgent::LLAgent() : mAgentAccess(gSavedSettings) { } +LLAgent::LLAgent() : mAgentAccess(NULL) { } LLAgent::~LLAgent() { } bool LLAgent::isGodlike() const { return FALSE; } -LLAgentAccess::LLAgentAccess(LLControlGroup& settings) : mSavedSettings(settings) { } -LLUIColor::LLUIColor() {} LLAgent gAgent; |