summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-08 15:33:36 -0400
committerOz Linden <oz@lindenlab.com>2012-06-08 15:33:36 -0400
commitf363292a845e7dd73181fe4407d3dcbf9f586f9a (patch)
tree72e5a4cfd13d65dea9fd559932f368d4cca0ce29 /indra/newview
parentef962b37e9bce22ed26f4e8a36ed04d670298fe8 (diff)
parentce563795e1f5d7493b975393bea9ec5cab90fd6a (diff)
merge changes to fix http tests
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";