diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-29 11:43:20 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-29 11:43:20 -0700 |
| commit | 87918b4bfe27ddcba2e4a44323ebc85e509a92fc (patch) | |
| tree | e37cc81e7b6292750941e767d33910fd95f20bb6 /indra/newview/llappviewer.cpp | |
| parent | b74af1c2aa4d8804a240135f54df7d3c21ce3ab6 (diff) | |
| parent | cb8641a639d077fe03853e69be597ee359f5a01f (diff) | |
Merge with 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")) { |