diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-06 23:23:21 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-06 23:23:21 +0300 |
| commit | f47b0b146e122b0d93ba6d1d05ca6490c20d07e2 (patch) | |
| tree | ed4c600c3888942d4f1dfcdb2d88aa08b58ff8e5 /indra/llcrashlogger/llcrashlogger.h | |
| parent | 7c09c648780d79cc240b76c9cb26e4bd1c0a8df2 (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(); |