diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 10:55:59 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 10:55:59 -0800 |
commit | b877665551343dc94ca02c84622b06518f9c23d8 (patch) | |
tree | 9ad6a76d0363b56ccb249f105d6ee72207df8864 /indra/llprimitive/tests | |
parent | f732ee6d2e24cd42a06b9cf51c8f6c577f2e476e (diff) | |
parent | 6e018f7143537af7bd9a08f1cc5c87ea4c8382c8 (diff) |
merge
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: "; |