summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-08 11:41:10 -0400
committerOz Linden <oz@lindenlab.com>2012-06-08 11:41:10 -0400
commit6abcd55b500db0e0cb0fedefeb5583588f20ff8c (patch)
treea01b56f04c8e39515b92fa050337483e6cda1c57 /indra/newview
parentfd14738857bac91b4e9ef5b212e6b8d8b9dfd61e (diff)
parent9ead6d8e5bf9aab7fd990104aed42629f2bd7114 (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";