diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-03 13:39:02 -0800 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-03 13:39:02 -0800 |
| commit | 28ed8f84d86403cf90b7963b147d2ac5c6cf37c7 (patch) | |
| tree | cebb2895642b96aa64e8cf8c2eb402e8423165d6 /indra/llprimitive/tests | |
| parent | 9c3595465972ba4be916e871f6b0a62cc0c13d4a (diff) | |
| parent | 63b9bd43ff41da01d549f630bd838caff0dffd97 (diff) | |
Merge with SVN render-pipeline-8 branch
Diffstat (limited to 'indra/llprimitive/tests')
| -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: "; |