diff options
| author | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:28:33 +0000 |
|---|---|---|
| committer | Simon Linden <simon@lindenlab.com> | 2014-07-18 22:28:33 +0000 |
| commit | 7714c7679da7c6c28c3f3f09af6b586a680dc26c (patch) | |
| tree | f14c766b090f50cbb866123305f676e831ef483b /indra/newview/tests/llmediadataclient_test.cpp | |
| parent | 1655887f30e40ea390b6dca9f64ac5e84309be05 (diff) | |
| parent | ff3827f278d2d53f565bc585edc4db5bc5e5dc38 (diff) | |
Merge in downstream viewer-tiger
Diffstat (limited to 'indra/newview/tests/llmediadataclient_test.cpp')
| -rwxr-xr-x | indra/newview/tests/llmediadataclient_test.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/tests/llmediadataclient_test.cpp b/indra/newview/tests/llmediadataclient_test.cpp index 3e55336f2d..6f57daf151 100755 --- a/indra/newview/tests/llmediadataclient_test.cpp +++ b/indra/newview/tests/llmediadataclient_test.cpp @@ -33,7 +33,7 @@ #include "llsdserialize.h" #include "llsdutil.h" #include "llerrorcontrol.h" -#include "llhttpstatuscodes.h" +#include "llhttpconstants.h" #include "../llmediadataclient.h" #include "../llvovolume.h" @@ -129,7 +129,7 @@ void LLHTTPClient::post( { LLSD content; content["reason"] = "fake reason"; - responder->errorWithContent(HTTP_SERVICE_UNAVAILABLE, "fake reason", content); + responder->failureResult(HTTP_SERVICE_UNAVAILABLE, "fake reason", content); return; } else if (url == FAKE_OBJECT_MEDIA_NAVIGATE_CAP_URL_ERROR) @@ -137,8 +137,8 @@ void LLHTTPClient::post( LLSD error; error["code"] = LLObjectMediaNavigateClient::ERROR_PERMISSION_DENIED_CODE; result["error"] = error; - } - responder->result(result); + } + responder->successResult(result); } const F32 HTTP_REQUEST_EXPIRY_SECS = 60.0f; |