diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-06 23:32:00 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-06 23:32:00 +0300 |
| commit | 6f5f307e0a751a78fbdfb4c6a1f8757ea55bf1dd (patch) | |
| tree | f08aee960597b959e68a1aea736daf65a1a202b8 /indra/llcrashlogger/llcrashlogger.h | |
| parent | b32d00308e4c3efee0c799f936155b58665ffc21 (diff) | |
| parent | 7f5e6cea124e1193b199a3eabd50bdab96340c13 (diff) | |
Merged in oz_linden/maint-5974
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.h')
| -rwxr-xr-x | indra/llcrashlogger/llcrashlogger.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h index f5383daefc..8b4afae24a 100755 --- a/indra/llcrashlogger/llcrashlogger.h +++ b/indra/llcrashlogger/llcrashlogger.h @@ -46,13 +46,12 @@ class LLCrashLogger : public LLApp public: LLCrashLogger(); virtual ~LLCrashLogger(); - S32 loadCrashBehaviorSetting(); - bool readDebugFromXML(LLSD& dest, const std::string& filename ); + std::string loadCrashURLSetting(); + bool readFromXML(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(); |