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/mac_crash_logger/mac_crash_logger.cpp | |
| parent | 7c09c648780d79cc240b76c9cb26e4bd1c0a8df2 (diff) | |
| parent | 7f5e6cea124e1193b199a3eabd50bdab96340c13 (diff) | |
Merged in oz_linden/maint-5974
Diffstat (limited to 'indra/mac_crash_logger/mac_crash_logger.cpp')
| -rwxr-xr-x | indra/mac_crash_logger/mac_crash_logger.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index d6b913829e..95d4e65207 100755 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -39,16 +39,12 @@ int main(int argc, char **argv) LLSD options = LLApp::instance()->getOptionData( LLApp::PRIORITY_COMMAND_LINE); - if (!(options.has("pid") && options.has("dumpdir"))) - { - llwarns << "Insufficient parameters to crash report." << llendl; - } - if (! app.init()) { LL_WARNS() << "Unable to initialize application." << LL_ENDL; return 1; } + if (app.getCrashBehavior() != CRASH_BEHAVIOR_ALWAYS_SEND) { // return NSApplicationMain(argc, (const char **)argv); |