diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-02 12:59:05 -0700 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-02 12:59:05 -0700 |
commit | 3a0a28705817dc1b9a5f626b7a5aa247a06a8fc6 (patch) | |
tree | e361bf5390a2b415d5eb285470016b75a124699e /indra/llprimitive | |
parent | 4d53e235c2445b820bb0ae7303b269648dd86037 (diff) |
Patches follow merge to latest viewer-20 updates
Diffstat (limited to 'indra/llprimitive')
-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: "; |