diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-20 12:59:16 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-20 12:59:16 -0700 |
commit | 85c4d40614b501d401159b9bb064a4f4c726265e (patch) | |
tree | ef610b296660a2969d4df60ef331a3b4b411b676 /indra/llprimitive/tests/llmediaentry_test.cpp | |
parent | a68b34eadf99c5875f2d7692185706e490e850bd (diff) | |
parent | b0dccf883ad67e43b9fac5bc81f7b79bf9c07f8c (diff) |
merge
Diffstat (limited to 'indra/llprimitive/tests/llmediaentry_test.cpp')
-rw-r--r-- | indra/llprimitive/tests/llmediaentry_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp index 72478d0459..9ce6560923 100644 --- a/indra/llprimitive/tests/llmediaentry_test.cpp +++ b/indra/llprimitive/tests/llmediaentry_test.cpp @@ -157,7 +157,7 @@ namespace tut void ensure_llsd_equals(const std::string& msg, const LLSD& expected, const LLSD& actual) { - if (! llsd_equals(expected, actual)) + if (!tut::llsd_equals(expected, actual)) { std::string message = msg; message += ": actual: "; |