diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-07-19 17:43:19 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-07-19 17:43:19 -0700 |
| commit | a242edc99d62f9f242c2f7f778f347af03a6f5a9 (patch) | |
| tree | 74c5672c9a045e5c8891702cc77eae9062dc9756 /indra/newview/llappcorehttp.h | |
| parent | 95b26d3becf8fef901ea09998866a9d8227cdcad (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge with Master after Viewer Release (also fixed some glaring automerge screw ups)
Diffstat (limited to 'indra/newview/llappcorehttp.h')
| -rw-r--r-- | indra/newview/llappcorehttp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llappcorehttp.h b/indra/newview/llappcorehttp.h index 95c138d598..751c498ab0 100644 --- a/indra/newview/llappcorehttp.h +++ b/indra/newview/llappcorehttp.h @@ -256,6 +256,7 @@ private: 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); }; |