Don't feed empty, non-working callback to CURL
Cherry-Pick of 96a4e16a
Conflicts:
indra/llmessage/llurlrequest.cpp
indra/llmessage/llurlrequest.h
indra/newview/hipporestrequest.cpp
Clear reasons for conflicts, resolved.
This commit is contained in:
committed by
Aleric Inglewood
parent
35a53ef1d7
commit
36ff4dcd11
@@ -155,12 +155,6 @@ public:
|
||||
///< for testing
|
||||
static LLPumpIO &getPump();
|
||||
///< Hippo special
|
||||
|
||||
static void setCertVerifyCallback(LLURLRequest::SSLCertVerifyCallback callback);
|
||||
static LLURLRequest::SSLCertVerifyCallback getCertVerifyCallback() { return mCertVerifyCallback; }
|
||||
|
||||
protected:
|
||||
static LLURLRequest::SSLCertVerifyCallback mCertVerifyCallback;
|
||||
};
|
||||
|
||||
#endif // LL_LLHTTPCLIENT_H
|
||||
|
||||
Reference in New Issue
Block a user