svn merge -r80434:80633 svn+ssh://svn.lindenlab.com/svn/linden/branches/dev-8000

2 files changed, 10 insertions, 0 deletions

diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index f850656785..d7812942c3 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -192,6 +192,11 @@ void LLURLRequest::useProxy(bool use_proxy)
     }
 }
 
+void LLURLRequest::useProxy(const std::string &proxy)
+{
+	curl_easy_setopt(mDetail->mCurl, CURLOPT_PROXY, proxy.c_str());
+}
+
 // virtual
 LLIOPipe::EStatus LLURLRequest::handleError(
 	LLIOPipe::EStatus status,
diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h
index b154794ff1..288bf463f5 100644
--- a/indra/llmessage/llurlrequest.h
+++ b/indra/llmessage/llurlrequest.h
@@ -166,6 +166,11 @@ public:
      */
     void useProxy(bool use_proxy);
 
+    /**
+     * @ brief Set the CURLOPT_PROXY header to the given value.
+     */
+	void useProxy(const std::string& proxy);
+
 public:
 	/** 
 	 * @brief Give this pipe a chance to handle a generated error