diff options
author | James Cook <james@lindenlab.com> | 2010-01-15 12:02:56 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2010-01-15 12:02:56 -0800 |
commit | 4acf56d2a79a4f3bb555977aeaef21e15e26f684 (patch) | |
tree | ac0d8ff2225916323d9b942246edd458e04fd738 /indra/newview/tests/llviewerhelputil_test.cpp | |
parent | 3f83c05f7c71887825c907b0e148d81cd7de5324 (diff) | |
parent | c9cf84913d306103da51dc83e5932ff3fb308d32 (diff) |
Merge in viewer-2-0 changes
Diffstat (limited to 'indra/newview/tests/llviewerhelputil_test.cpp')
-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 |