diff options
author | Lynx Linden <lynx@lindenlab.com> | 2010-01-15 00:39:16 +0000 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2010-01-15 00:39:16 +0000 |
commit | 30c5d4477c3b731a50039850c7fcb52e9a59f32d (patch) | |
tree | 2e4ecf10791b2d8e1698db7837931bdeb28c48ea /indra/newview/tests | |
parent | 6ede6f0c9c0aa56c78675c555aba05327bd2739b (diff) |
EXT-4340: Fixed and re-enabled the llviewerhelputil unit test.
Diffstat (limited to 'indra/newview/tests')
-rw-r--r-- | indra/newview/tests/llviewerhelputil_test.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp index ec612c4606..d7dd199722 100644 --- a/indra/newview/tests/llviewerhelputil_test.cpp +++ b/indra/newview/tests/llviewerhelputil_test.cpp @@ -78,9 +78,21 @@ static void substitute_string(std::string &input, const std::string &search, con } } +class LLAgent +{ +public: + LLAgent() {} + ~LLAgent() {} + BOOL isGodlike() const { return FALSE; } +private: + int dummy; +}; +LLAgent gAgent; + std::string LLWeb::expandURLSubstitutions(const std::string &url, const LLSD &default_subs) { + (void)gAgent.isGodlike(); // ref symbol to stop compiler from stripping it std::string new_url = url; substitute_string(new_url, "[TOPIC]", default_subs["TOPIC"].asString()); substitute_string(new_url, "[VERSION]", gVersion); @@ -91,6 +103,7 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url, return new_url; } + //---------------------------------------------------------------------------- namespace tut |