summaryrefslogtreecommitdiff
path: root/indra/newview/tests/llmediadataclient_test.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-07-09 21:44:02 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-07-09 21:44:02 -0400
commit768ef450678a93496fb69012efaa15c915969c47 (patch)
tree023ead1927667d4fb11cb56dceadc33694d35937 /indra/newview/tests/llmediadataclient_test.cpp
parent657944cda7228ba824239d94b270160ac0460934 (diff)
parent33007699cc701baf0c312ff669e659d874f3ae2f (diff)
Merge suppress http_proxy in INTEGRATION_TEST_llcorehttp
Diffstat (limited to 'indra/newview/tests/llmediadataclient_test.cpp')
-rwxr-xr-xindra/newview/tests/llmediadataclient_test.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/tests/llmediadataclient_test.cpp b/indra/newview/tests/llmediadataclient_test.cpp
index 6f57daf151..61120686e4 100755
--- a/indra/newview/tests/llmediadataclient_test.cpp
+++ b/indra/newview/tests/llmediadataclient_test.cpp
@@ -106,7 +106,7 @@ const char *DATA = _DATA(VALID_OBJECT_ID,"1.0","true");
LLSD *gPostRecords = NULL;
F64 gMinimumInterestLevel = (F64)0.0;
-
+#if 0
// stubs:
void LLHTTPClient::post(
const std::string& url,
@@ -140,6 +140,7 @@ void LLHTTPClient::post(
}
responder->successResult(result);
}
+#endif
const F32 HTTP_REQUEST_EXPIRY_SECS = 60.0f;