summaryrefslogtreecommitdiff
path: root/indra/llmessage/tests
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-08-01 14:07:24 -0700
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-08-01 14:07:24 -0700
commitb7555a3309bda8e9689627901051aa90fcb7be34 (patch)
treebbb84478c302539f434bab7a620fe23456926236 /indra/llmessage/tests
parent62379fd7628afa5ce1b104ff66b26821ce740c29 (diff)
parent92a0db2a4f5397067e087068f736181e618e9c0a (diff)
Merge back viewer-lion, which has viewer-development and down-stream fixes
Diffstat (limited to 'indra/llmessage/tests')
-rw-r--r--indra/llmessage/tests/llhttpclient_test.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmessage/tests/llhttpclient_test.cpp b/indra/llmessage/tests/llhttpclient_test.cpp
index 843c3bcc4b..e338d4ec71 100644
--- a/indra/llmessage/tests/llhttpclient_test.cpp
+++ b/indra/llmessage/tests/llhttpclient_test.cpp
@@ -258,6 +258,7 @@ namespace tut
void HTTPClientTestObject::test<1>()
{
LLHTTPClient::get(local_server, newResult());
+
runThePump();
ensureStatusOK();
ensure("result object wasn't destroyed", mResultDeleted);