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, 6 insertions, 4 deletions

diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 26120b52f6..9ffc9b9a7a 100755
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -34,6 +34,7 @@
 #include "llcoordframe.h"			// for mFrameAgent
 #include "llavatarappearancedefines.h"
 #include "llpermissionsflags.h"
+#include "llevents.h"
 #include "v3dmath.h"
 #include "httprequest.h"
 #include "httpheaders.h"
@@ -117,9 +118,7 @@ public:
 	void			cleanup();
 
 private:
-	bool			onIdle();
 
-	static bool		mActive;
 	//--------------------------------------------------------------------
 	// Login
 	//--------------------------------------------------------------------
@@ -767,6 +766,7 @@ private:
 	LLCore::HttpOptions::ptr_t		mHttpOptions;
 	LLCore::HttpRequest::policy_t	mHttpPolicy;
 	LLCore::HttpRequest::priority_t	mHttpPriority;
+    LLTempBoundListener             mBoundListener;
 
 	bool            isMaturityPreferenceSyncedWithServer() const;
 	void 			sendMaturityPreferenceToServer(U8 pPreferredMaturity);
@@ -781,6 +781,8 @@ private:
 	void 			handleMaturity(const LLSD &pNewValue);
 	bool 			validateMaturity(const LLSD& newvalue);
 
+    bool            pollHttp(const LLSD &);
+
 
 /**                    Access
  **                                                                            **
@@ -924,9 +926,9 @@ public:
  **/
 public:
 	/// Utilities for allowing the the agent sub managers to post and get via
-	/// HTTP using the agent's policy settings and headers.
+	/// HTTP using the agent's policy settings and headers.  
 	LLCore::HttpHandle	requestPostCapability(const std::string &cap, const std::string &url, LLSD &postData, LLHttpSDHandler *usrhndlr = NULL);
-	//LLCore::HttpHandle	httpGetCapability(const std::string &cap, const LLURI &uri, LLHttpSDHandler *usrhndlr = NULL);
+    LLCore::HttpHandle	requestGetCapability(const std::string &cap, const std::string &url, LLHttpSDHandler *usrhndlr = NULL);
 
 /**                    Utility
  **                                                                            **