diff options
Diffstat (limited to 'indra/llcrashlogger')
| -rwxr-xr-x | indra/llcrashlogger/llcrashlogger.cpp | 10 | ||||
| -rwxr-xr-x | indra/llcrashlogger/llcrashlogger.h | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index fb2d43e3b0..7d70d156e1 100755 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -163,8 +163,8 @@ void LLCrashLogger::gatherFiles() LLCurl::setCAFile(gDirUtilp->getCAFile()); } - llinfos << "Using log file from debug log " << mFileMap["SecondLifeLog"] << llendl; - llinfos << "Using settings file from debug log " << mFileMap["SettingsXml"] << llendl; + LL_INFOS() << "Using log file from debug log " << mFileMap["SecondLifeLog"] << LL_ENDL; + LL_INFOS() << "Using settings file from debug log " << mFileMap["SettingsXml"] << LL_ENDL; } else { @@ -376,7 +376,7 @@ void LLCrashLogger::updateApplication(const std::string& message) { gServicePump->pump(); gServicePump->callback(); - if (!message.empty()) llinfos << message << llendl; + if (!message.empty()) LL_INFOS() << message << LL_ENDL; } bool LLCrashLogger::init() @@ -405,13 +405,13 @@ bool LLCrashLogger::init() "1 = always send crash report, " "2 = never send crash report)"); - // llinfos << "Loading crash behavior setting" << llendl; + // LL_INFOS() << "Loading crash behavior setting" << LL_ENDL; // mCrashBehavior = loadCrashBehaviorSetting(); // If user doesn't want to send, bail out if (mCrashBehavior == CRASH_BEHAVIOR_NEVER_SEND) { - llinfos << "Crash behavior is never_send, quitting" << llendl; + LL_INFOS() << "Crash behavior is never_send, quitting" << LL_ENDL; return false; } diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h index 1510d7e0b3..abd6426d68 100755 --- a/indra/llcrashlogger/llcrashlogger.h +++ b/indra/llcrashlogger/llcrashlogger.h @@ -34,6 +34,11 @@ #include "llsd.h" #include "llcontrol.h" +// Crash reporter behavior +const S32 CRASH_BEHAVIOR_ASK = 0; +const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1; +const S32 CRASH_BEHAVIOR_NEVER_SEND = 2; + class LLCrashLogger : public LLApp { public: |