livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/

master
Rick Pasetto 2010-02-02 17:11:33 -08:00
parent 5285e5479c 7b207cfde4
commit 4a8379d2d3
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llprimitive/tests/llmediaentry_test.cpp
View File

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