diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-06-29 15:52:24 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-06-29 15:52:24 -0400 |
| commit | 50c40dd72e7a36af91cb84395a4a88b984b219aa (patch) | |
| tree | a29dccea6bfaac6d76e1cef4ae0579295ca6c3b2 /indra/newview/llappviewer.cpp | |
| parent | 6da0725c3b75c24855537df877672595de8e56e6 (diff) | |
| parent | 87918b4bfe27ddcba2e4a44323ebc85e509a92fc (diff) | |
Merged my latest eventhost changes with tip/latest viewer-2.0.0-3.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ff5ddbfcfb..f9e6db52c3 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -641,6 +641,11 @@ bool LLAppViewer::init() // Get the single value from the crash settings file, if it exists std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE); gCrashSettings.loadFromFile(crash_settings_filename); + if(gSavedSettings.getBOOL("IgnoreAllNotifications")) + { + gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ALWAYS_SEND); + gCrashSettings.saveToFile(crash_settings_filename, FALSE); + } ///////////////////////////////////////////////// // OS-specific login dialogs @@ -1971,6 +1976,11 @@ bool LLAppViewer::initConfiguration() { LLAgentPilot::sReplaySession = TRUE; } + + if (clp.hasOption("nonotifications")) + { + gSavedSettings.setBOOL("IgnoreAllNotifications", TRUE); + } if (clp.hasOption("debugsession")) { |