summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-09-20 19:43:54 -0700
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-09-20 19:43:54 -0700
commitc6a2ac0489859111276421d620abd156339c607d (patch)
tree1bfbeb5d0ddcedd77854e5e5c8b6ad675ed6ef3c /indra/llmessage
parentae127dc01ab10d407cf165ae2ad74060f65c1832 (diff)
parent29cdf94e95d0a4365bd18860c4759f9a6a13f45a (diff)
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/tests/llhttpclient_test.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llmessage/tests/llhttpclient_test.cpp b/indra/llmessage/tests/llhttpclient_test.cpp
index e338d4ec71..843c3bcc4b 100644
--- a/indra/llmessage/tests/llhttpclient_test.cpp
+++ b/indra/llmessage/tests/llhttpclient_test.cpp
@@ -258,7 +258,6 @@ namespace tut
void HTTPClientTestObject::test<1>()
{
LLHTTPClient::get(local_server, newResult());
-
runThePump();
ensureStatusOK();
ensure("result object wasn't destroyed", mResultDeleted);