merge from viewer-public

1 files changed, 1 insertions, 11 deletions

diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index caf02cccd9..b6a637ae5b 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -158,16 +158,6 @@ public:
 	static const std::string& getCAPath() { return sCAPath; }
 
 	/**
-	 * @ brief Set flag controlling whether to verify HTTPS certs.
-	 */
-	static void setSSLVerify(bool verify);
-
-	/**
-	 * @ brief Get flag controlling whether to verify HTTPS certs.
-	 */
-	static bool getSSLVerify();
-
-	/**
 	 * @ brief Initialize LLCurl class
 	 */
 	static void initClass();
@@ -192,7 +182,6 @@ public:
 private:
 	static std::string sCAPath;
 	static std::string sCAFile;
-	static bool sSSLVerify;
 };
 
 namespace boost
@@ -240,6 +229,7 @@ public:
 	void setHeaderCallback(curl_header_callback callback, void* userdata);
 	void setWriteCallback(curl_write_callback callback, void* userdata);
 	void setReadCallback(curl_read_callback callback, void* userdata);
+	void setSSLCtxCallback(curl_ssl_ctx_callback callback, void* userdata);
 	void slist_append(const char* str);
 	void sendRequest(const std::string& url);
 	void requestComplete();