From 03abd8dc2033c9166d618c9171975f1dc1d4aaa9 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 19 Jun 2014 01:06:23 +0100
Subject: Updated LLRegionExperienceResponder and LLExperienceSearchResponder
to use new interface
---
indra/newview/llfloaterregioninfo.cpp | 17 ++++++++--------
indra/newview/llpanelexperiencepicker.cpp | 32 ++++++++++++++++---------------
2 files changed, 25 insertions(+), 24 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index e7a8e12039..f70152fc59 100755
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -3629,16 +3629,15 @@ public:
LLRegionExperienceResponder(callback_t callback) : mCallback(callback) { }
- void completed(U32 status, const std::string& reason, const LLSD& content)
+protected:
+ /*virtual*/ void httpSuccess()
{
- if (isGoodStatus(status))
- {
- mCallback(content);
- }
- else
- {
- LL_WARNS() << "experience responder failed [status:" << status << "]: " << content << LL_ENDL;
- }
+ mCallback(getContent());
+ }
+
+ /*virtual*/ void httpFailure()
+ {
+ LL_WARNS() << "experience responder failed [status:" << getStatus() << "]: " << getContent() << LL_ENDL;
}
};
diff --git a/indra/newview/llpanelexperiencepicker.cpp b/indra/newview/llpanelexperiencepicker.cpp
index 19778cb200..0a572a8a5c 100644
--- a/indra/newview/llpanelexperiencepicker.cpp
+++ b/indra/newview/llpanelexperiencepicker.cpp
@@ -65,28 +65,30 @@ public:
LLExperienceSearchResponder(const LLUUID& id, const LLHandle<LLPanelExperiencePicker>& parent) : mQueryID(id), mParent(parent) { }
- void completed(U32 status, const std::string& reason, const LLSD& content)
+protected:
+ /*virtual*/ void httpSuccess()
{
if(mParent.isDead())
return;
- if (isGoodStatus(status))
+
+ LLPanelExperiencePicker* panel =mParent.get();
+ if (panel)
{
- LLPanelExperiencePicker* panel =mParent.get();
- if (panel)
- {
- panel->processResponse(mQueryID, content);
- }
+ panel->processResponse(mQueryID, getContent());
}
- else
- {
- LLPanelExperiencePicker* panel =mParent.get();
- if (panel)
- {
- panel->processResponse(mQueryID, LLSD());
- }
- LL_WARNS() << "experience picker failed [status:" << status << "]: " << content << LL_ENDL;
+ }
+ /*virtual*/ void httpFailure()
+ {
+ if(mParent.isDead())
+ return;
+
+ LLPanelExperiencePicker* panel =mParent.get();
+ if (panel)
+ {
+ panel->processResponse(mQueryID, LLSD());
}
+ LL_WARNS() << "experience picker failed [status:" << getStatus() << "]: " << getContent() << LL_ENDL;
}
};
--
cgit v1.2.3