Merge suppress http_proxy in INTEGRATION_TEST_llcorehttp

1 files changed, 4 insertions, 0 deletions

diff --git a/indra/newview/llfloatermodeluploadbase.h b/indra/newview/llfloatermodeluploadbase.h
index d9a8879687..0d4c834122 100755
--- a/indra/newview/llfloatermodeluploadbase.h
+++ b/indra/newview/llfloatermodeluploadbase.h
@@ -28,6 +28,8 @@
 #define LL_LLFLOATERMODELUPLOADBASE_H
 
 #include "lluploadfloaterobservers.h"
+#include "llcoros.h"
+#include "lleventcoro.h"
 
 class LLFloaterModelUploadBase : public LLFloater, public LLUploadPermissionsObserver, public LLWholeModelFeeObserver, public LLWholeModelUploadObserver
 {
@@ -54,6 +56,8 @@ protected:
 	// requests agent's permissions to upload model
 	void requestAgentUploadPermissions();
 
+    void requestAgentUploadPermissionsCoro(std::string url, LLHandle<LLUploadPermissionsObserver> observerHandle);
+
 	std::string mUploadModelUrl;
 	bool mHasUploadPerm;
 };