diff options
| author | Aaron Stone <stone@lindenlab.com> | 2011-07-12 15:48:02 -0700 |
|---|---|---|
| committer | Aaron Stone <stone@lindenlab.com> | 2011-07-12 15:48:02 -0700 |
| commit | 42daa3497b6626cbb5f32ba54162558cd025069b (patch) | |
| tree | 65fb889b9aefe63171de33d21de93bb81c832733 /indra/linux_crash_logger | |
| parent | 66dcc72870b19c6ada65a643ca33c779c9c9989b (diff) | |
STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some cleanups to the crash reporters, and the ability to use --set GroupName.SettingName to set parameters outside of the (default) Global settings group.
Diffstat (limited to 'indra/linux_crash_logger')
| -rw-r--r-- | indra/linux_crash_logger/linux_crash_logger.cpp | 14 | ||||
| -rw-r--r-- | indra/linux_crash_logger/llcrashloggerlinux.cpp | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp index 8beae555fb..99d0ad7e14 100644 --- a/indra/linux_crash_logger/linux_crash_logger.cpp +++ b/indra/linux_crash_logger/linux_crash_logger.cpp @@ -24,16 +24,24 @@ * $/LicenseInfo$ */ +#include "linden_common.h" #include "llcrashloggerlinux.h" int main(int argc, char **argv) { + llinfos << "Starting crash reporter." << llendl; + LLCrashLoggerLinux app; app.parseCommandOptions(argc, argv); - app.init(); + + if (! app.init()) + { + llwarns << "Unable to initialize application." << llendl; + return 1; + } + app.mainLoop(); app.cleanup(); + llinfos << "Crash reporter finished normally." << llendl; return 0; } - - diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp index 7449c6426f..7316717193 100644 --- a/indra/linux_crash_logger/llcrashloggerlinux.cpp +++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp @@ -30,8 +30,6 @@ #include "linden_common.h" -#include "boost/tokenizer.hpp" - #include "indra_constants.h" // CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME #include "llerror.h" #include "llfile.h" |