diff options
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.h')
| -rwxr-xr-x | indra/llcrashlogger/llcrashlogger.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h index 1510d7e0b3..78acc63b6a 100755 --- a/indra/llcrashlogger/llcrashlogger.h +++ b/indra/llcrashlogger/llcrashlogger.h @@ -33,6 +33,7 @@ #include "llapp.h" #include "llsd.h" #include "llcontrol.h" +#include "llcrashlock.h" class LLCrashLogger : public LLApp { @@ -40,9 +41,13 @@ public: LLCrashLogger(); virtual ~LLCrashLogger(); S32 loadCrashBehaviorSetting(); + bool readDebugFromXML(LLSD& dest, const std::string& filename ); void gatherFiles(); + void mergeLogs( LLSD src_sd ); + virtual void gatherPlatformSpecificFiles() {} bool saveCrashBehaviorSetting(S32 crash_behavior); + bool sendCrashLog(std::string dump_dir); bool sendCrashLogs(); LLSD constructPostData(); virtual void updateApplication(const std::string& message = LLStringUtil::null); @@ -53,6 +58,8 @@ public: void setUserText(const std::string& text) { mCrashInfo["UserNotes"] = text; } S32 getCrashBehavior() { return mCrashBehavior; } bool runCrashLogPost(std::string host, LLSD data, std::string msg, int retries, int timeout); + bool readMinidump(std::string minidump_path); + protected: S32 mCrashBehavior; BOOL mCrashInPreviousExec; @@ -65,6 +72,7 @@ protected: std::string mAltCrashHost; LLSD mDebugLog; bool mSentCrashLogs; + LLCrashLock mKeyMaster; }; #endif //LLCRASHLOGGER_H |