Added AvatarNameCache as coroutine, with LLCore::HttpHandler to respond correctly to Event Pumps.

Added get/setRequestURL() to LLCore::HttpResponse
Removed URI from the HttpSDHandler.

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 709d9881e1..4fbcd90baa 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1249,8 +1249,8 @@ static void removeDuplicateItems(LLInventoryModel::item_array_t& items)
 class LLAppearanceMgrHttpHandler : public LLHttpSDHandler
 {
 public:
-	LLAppearanceMgrHttpHandler(const std::string& capabilityURL, LLAppearanceMgr *mgr) :
-		LLHttpSDHandler(capabilityURL),
+	LLAppearanceMgrHttpHandler(LLAppearanceMgr *mgr) :
+		LLHttpSDHandler(),
 		mManager(mgr)
 	{ }
 
@@ -1314,7 +1314,7 @@ void LLAppearanceMgrHttpHandler::onSuccess(LLCore::HttpResponse * response, cons
 
 void LLAppearanceMgrHttpHandler::onFailure(LLCore::HttpResponse * response, LLCore::HttpStatus status)
 {
-	LL_WARNS("Avatar") << "Appearance Mgr request failed to " << getUri()
+	LL_WARNS("Avatar") << "Appearance Mgr request failed to " << response->getRequestURL()
 		<< ". Reason code: (" << status.toTerseString() << ") "
 		<< status.toString() << LL_ENDL;
 }
@@ -3434,7 +3434,7 @@ void LLAppearanceMgr::requestServerAppearanceUpdate()
 	}
 	LL_DEBUGS("Avatar") << "request url " << url << " my_cof_version " << cof_version << LL_ENDL;
 
-	LLAppearanceMgrHttpHandler * handler = new LLAppearanceMgrHttpHandler(url, this);
+	LLAppearanceMgrHttpHandler * handler = new LLAppearanceMgrHttpHandler(this);
 
 	mInFlightCounter++;
 	mInFlightTimer.setTimerExpirySec(60.0);