summaryrefslogtreecommitdiff
path: root/indra/win_crash_logger/win_crash_logger.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-04-07 14:26:15 -0700
committersimon <none@none>2014-04-07 14:26:15 -0700
commit991636d57bd4a67e42a5425fe53bf66bf9cf8d07 (patch)
tree733d71a2606bf4308d3afb26e90b0de85a65c19b /indra/win_crash_logger/win_crash_logger.cpp
parent29840c0c569a3b0296bcab38d04fc237fb9827ed (diff)
parent7e966f28da79d2d24f93a2615c8807421300700c (diff)
Merge in viewer-release and version update to 3.7.6
Diffstat (limited to 'indra/win_crash_logger/win_crash_logger.cpp')
-rwxr-xr-xindra/win_crash_logger/win_crash_logger.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/win_crash_logger/win_crash_logger.cpp b/indra/win_crash_logger/win_crash_logger.cpp
index 8e916ae437..79b8514725 100755
--- a/indra/win_crash_logger/win_crash_logger.cpp
+++ b/indra/win_crash_logger/win_crash_logger.cpp
@@ -34,18 +34,24 @@ int APIENTRY WinMain(HINSTANCE hInstance,
LPSTR lpCmdLine,
int nCmdShow)
{
- llinfos << "Starting crash reporter." << llendl;
-
+ llinfos << "Starting crash reporter with args" << &lpCmdLine << llendl;
LLCrashLoggerWindows app;
app.setHandle(hInstance);
app.parseCommandOptions(__argc, __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())
{
llwarns << "Unable to initialize application." << llendl;
- return -1;
+ return 1;
}
+ app.processingLoop();
app.mainLoop();
app.cleanup();
llinfos << "Crash reporter finished normally." << llendl;