diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-09 21:44:02 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-09 21:44:02 -0400 |
| commit | 768ef450678a93496fb69012efaa15c915969c47 (patch) | |
| tree | 023ead1927667d4fb11cb56dceadc33694d35937 /indra/llcrashlogger/llcrashlogger.h | |
| parent | 657944cda7228ba824239d94b270160ac0460934 (diff) | |
| parent | 33007699cc701baf0c312ff669e659d874f3ae2f (diff) | |
Merge suppress http_proxy in INTEGRATION_TEST_llcorehttp
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.h')
| -rwxr-xr-x | indra/llcrashlogger/llcrashlogger.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h index a06bf1d6ac..f5383daefc 100755 --- a/indra/llcrashlogger/llcrashlogger.h +++ b/indra/llcrashlogger/llcrashlogger.h @@ -34,6 +34,7 @@ #include "llsd.h" #include "llcontrol.h" #include "llcrashlock.h" +#include "_mutex.h" // Crash reporter behavior const S32 CRASH_BEHAVIOR_ASK = 0; @@ -66,6 +67,11 @@ public: bool readMinidump(std::string minidump_path); protected: + static void init_curl(); + static void term_curl(); + static unsigned long ssl_thread_id_callback(void); + static void ssl_locking_callback(int mode, int type, const char * file, int line); + S32 mCrashBehavior; BOOL mCrashInPreviousExec; std::map<std::string, std::string> mFileMap; @@ -78,6 +84,10 @@ protected: LLSD mDebugLog; bool mSentCrashLogs; LLCrashLock mKeyMaster; + + static int ssl_mutex_count; + static LLCoreInt::HttpMutex ** ssl_mutex_list; + }; #endif //LLCRASHLOGGER_H |