diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-01 16:37:05 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-01 16:37:05 -0800 |
| commit | 00806c2c64bcaa3e2cee907d23288dd7cb6491f6 (patch) | |
| tree | 4699197f027934cf6750b094e48316cac5a5ca0b /indra/llprimitive/tests/llmediaentry_test.cpp | |
| parent | aeaaf90fd7e36432428df9a6bcda6eb51a5cf0b1 (diff) | |
| parent | 6294d4f7bf809de91c910ff56391bcf9fa78b124 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llprimitive/tests/llmediaentry_test.cpp')
| -rw-r--r-- | indra/llprimitive/tests/llmediaentry_test.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp index 277e370ca4..88cd96ebe4 100644 --- a/indra/llprimitive/tests/llmediaentry_test.cpp +++ b/indra/llprimitive/tests/llmediaentry_test.cpp @@ -157,14 +157,9 @@ namespace namespace tut { - bool llsd_equals(const LLSD& a, const LLSD& b) { - // cheesy, brute force, but it works - return std::string(ll_pretty_print_sd(a)) == std::string(ll_pretty_print_sd(b)); - } - void ensure_llsd_equals(const std::string& msg, const LLSD& expected, const LLSD& actual) { - if (!tut::llsd_equals(expected, actual)) + if (!llsd_equals(expected, actual)) { std::string message = msg; message += ": actual: "; |