diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
| commit | e15002a11cf5081e0697065cb017ba0af6c4b32d (patch) | |
| tree | d60ac6d3a85d114b7860e42be5d9ff3338a6a169 /indra/newview/tests/llmediadataclient_test.cpp | |
| parent | 78be5c3aa5f7263698bec5bcbccb24c150f78d09 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
merge changes for 3.7.9-release
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; |