diff options
Diffstat (limited to 'linden/indra/newview/llappviewerlinux.cpp')
-rw-r--r-- | linden/indra/newview/llappviewerlinux.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp index e41c505..5537687 100644 --- a/linden/indra/newview/llappviewerlinux.cpp +++ b/linden/indra/newview/llappviewerlinux.cpp | |||
@@ -333,13 +333,15 @@ void LLAppViewerLinux::handleSyncCrashTrace() | |||
333 | 333 | ||
334 | void LLAppViewerLinux::handleCrashReporting() | 334 | void LLAppViewerLinux::handleCrashReporting() |
335 | { | 335 | { |
336 | const S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING); | ||
337 | |||
336 | // Always generate the report, have the logger do the asking, and | 338 | // Always generate the report, have the logger do the asking, and |
337 | // don't wait for the logger before exiting (-> total cleanup). | 339 | // don't wait for the logger before exiting (-> total cleanup). |
338 | if (CRASH_BEHAVIOR_NEVER_SEND != LLAppViewer::instance()->getCrashBehavior()) | 340 | if (CRASH_BEHAVIOR_NEVER_SEND != cb) |
339 | { | 341 | { |
340 | // launch the actual crash logger | 342 | // launch the actual crash logger |
341 | char* ask_dialog = "-dialog"; | 343 | char* ask_dialog = "-dialog"; |
342 | if (CRASH_BEHAVIOR_ASK != LLAppViewer::instance()->getCrashBehavior()) | 344 | if (CRASH_BEHAVIOR_ASK != cb) |
343 | ask_dialog = ""; // omit '-dialog' option | 345 | ask_dialog = ""; // omit '-dialog' option |
344 | std::string cmd =gDirUtilp->getAppRODataDir(); | 346 | std::string cmd =gDirUtilp->getAppRODataDir(); |
345 | cmd += gDirUtilp->getDirDelimiter(); | 347 | cmd += gDirUtilp->getDirDelimiter(); |