diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:15:22 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-23 12:15:22 -0700 |
commit | 127b428863707c882fbf4d30699321b8a2365644 (patch) | |
tree | 728c98bd177635891f0646ccabcf86b70341d4a0 /indra/llprimitive/tests/llmediaentry_test.cpp | |
parent | 0220106ecdecd323854522a5bc3fd6455c60fdfc (diff) | |
parent | 2438a9168b117dcabf5e5819f93e08a874735a26 (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: "; |