diff --git a/doc/contributions.txt b/doc/contributions.txt index 6096d57283..0909bb52bc 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -272,6 +272,7 @@ Beq Janus SL-13583 SL-14766 SL-14927 + SL-11300 Beth Walcher Bezilon Kasei Biancaluce Robbiani diff --git a/indra/newview/llappcorehttp.h b/indra/newview/llappcorehttp.h index af4f049cd4..8cd231d319 100644 --- a/indra/newview/llappcorehttp.h +++ b/indra/newview/llappcorehttp.h @@ -271,6 +271,7 @@ private: bool mStopped; HttpClass mHttpClasses[AP_COUNT]; bool mPipelined; // Global setting + boost::signals2::connection mPipelinedSignal; // Signal for 'HttpPipelining' setting boost::signals2::connection mSSLNoVerifySignal; // Signal for 'NoVerifySSLCert' setting static LLCore::HttpStatus sslVerify(const std::string &uri, const LLCore::HttpHandler::ptr_t &handler, void *appdata);