automated merge viewer2.0->viewer2.0

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: ";