From 87fc26e0c6d8b09bc3747922fb1c1b9a2d757e98 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 6 Jan 2014 17:29:39 -0500 Subject: SH-4666 WIP - modified LLMaterialsResponder to use httpSuccess()/httpFailure() --- indra/newview/llmaterialmgr.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) mode change 100644 => 100755 indra/newview/llmaterialmgr.cpp (limited to 'indra/newview/llmaterialmgr.cpp') diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp old mode 100644 new mode 100755 index 14d3d4e7a8..2e569543bd --- a/indra/newview/llmaterialmgr.cpp +++ b/indra/newview/llmaterialmgr.cpp @@ -71,8 +71,8 @@ public: LLMaterialsResponder(const std::string& pMethod, const std::string& pCapabilityURL, CallbackFunction pCallback); virtual ~LLMaterialsResponder(); - virtual void result(const LLSD& pContent); - virtual void error(U32 pStatus, const std::string& pReason); + virtual void httpSuccess(); + virtual void httpFailure(); private: std::string mMethod; @@ -92,14 +92,19 @@ LLMaterialsResponder::~LLMaterialsResponder() { } -void LLMaterialsResponder::result(const LLSD& pContent) +void LLMaterialsResponder::httpSuccess() { + const LLSD& pContent = getContent(); + LL_DEBUGS("Materials") << LL_ENDL; mCallback(true, pContent); } -void LLMaterialsResponder::error(U32 pStatus, const std::string& pReason) +void LLMaterialsResponder::httpFailure() { + U32 pStatus = (U32) getStatus(); + const std::string& pReason = getReason(); + LL_WARNS("Materials") << "\n--------------------------------------------------------------------------\n" << mMethod << " Error[" << pStatus << "] cannot access cap '" << MATERIALS_CAPABILITY_NAME -- cgit v1.2.3