diff options
author | Roxie Linden <roxie@lindenlab.com> | 2024-05-20 12:59:59 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2024-05-20 12:59:59 -0700 |
commit | 3a212d9608492ae64a3a32f80790371b90be9e9e (patch) | |
tree | fcb3901b838af753e40c2ddd1ce84b95a6c2f603 /indra/linux_crash_logger/linux_crash_logger.cpp | |
parent | c7461061b8113fa258611b1a31f16a119fad1a2c (diff) | |
parent | e1623bb276f83a43ce7a197e388720c05bdefe61 (diff) |
Merge branch 'spaces-merge' into roxie/webrtc-voice
Diffstat (limited to 'indra/linux_crash_logger/linux_crash_logger.cpp')
-rw-r--r-- | indra/linux_crash_logger/linux_crash_logger.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp index 63e5409876..b36312c607 100644 --- a/indra/linux_crash_logger/linux_crash_logger.cpp +++ b/indra/linux_crash_logger/linux_crash_logger.cpp @@ -1,25 +1,25 @@ -/** +/** * @file linux_crash_logger.cpp * @brief Linux crash logger implementation * * $LicenseInfo:firstyear=2003&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -30,29 +30,29 @@ int main(int argc, char **argv) { - LL_INFOS() << "Starting crash reporter." << LL_ENDL; + LL_INFOS() << "Starting crash reporter." << LL_ENDL; - LLCrashLoggerLinux app; - app.parseCommandOptions(argc, argv); + LLCrashLoggerLinux app; + app.parseCommandOptions(argc, argv); LLSD options = LLApp::instance()->getOptionData( LLApp::PRIORITY_COMMAND_LINE); //LLApp::PRIORITY_RUNTIME_OVERRIDE); - + if (!(options.has("pid") && options.has("dumpdir"))) { LL_WARNS() << "Insufficient parameters to crash report." << LL_ENDL; } - if (! app.init()) - { - LL_WARNS() << "Unable to initialize application." << LL_ENDL; - return 1; - } + if (! app.init()) + { + LL_WARNS() << "Unable to initialize application." << LL_ENDL; + return 1; + } - app.frame(); - app.cleanup(); - LL_INFOS() << "Crash reporter finished normally." << LL_ENDL; - return 0; + app.frame(); + app.cleanup(); + LL_INFOS() << "Crash reporter finished normally." << LL_ENDL; + return 0; } |