summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-07 13:39:42 -0400
committerOz Linden <oz@lindenlab.com>2012-06-07 13:39:42 -0400
commit680dda8ed2c69f40d71c7264989f60a375d1b3a8 (patch)
tree86fe057b2345cb6140250939f1d1a313ea02123d /indra/newview
parentada746bd2a8296f9a2335d98b84a4118abd4db4d (diff)
parent14335ff562825a04c5ada50bb80d03c2dfa21cad (diff)
merge changes for DRTVWR-162
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/tests/llcapabilitylistener_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/llcapabilitylistener_test.cpp b/indra/newview/tests/llcapabilitylistener_test.cpp
index 2ad08dc1f3..e1cbd28f92 100644
--- a/indra/newview/tests/llcapabilitylistener_test.cpp
+++ b/indra/newview/tests/llcapabilitylistener_test.cpp
@@ -156,7 +156,7 @@ namespace tut
regionPump.post(request);
ensure("got response", netio.pump());
ensure("success response", success);
- ensure_equals(result.asString(), "success");
+ ensure_equals(result["reply"].asString(), "success");
body["status"] = 499;
body["reason"] = "custom error message";