diff options
| author | Aaron Stone <stone@lindenlab.com> | 2011-07-15 12:46:06 -0700 |
|---|---|---|
| committer | Aaron Stone <stone@lindenlab.com> | 2011-07-15 12:46:06 -0700 |
| commit | a517d32c4877aec79219cd346709c621c51c032b (patch) | |
| tree | 3c2c4cf3949812d5c7f857c63de20980c0467f91 /indra/llcrashlogger/llcrashlogger.cpp | |
| parent | f3dd16ac47ba937a92c3050c087d36c50674b06d (diff) | |
STORM-1482 Change the defaults, look in the app_settings dir for configs as well.
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.cpp')
| -rw-r--r-- | indra/llcrashlogger/llcrashlogger.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index 3fbaf61991..93f3c910bd 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -67,7 +67,7 @@ public: }; LLCrashLogger::LLCrashLogger() : - mCrashBehavior(CRASH_BEHAVIOR_ASK), + mCrashBehavior(CRASH_BEHAVIOR_ALWAYS_SEND), mCrashInPreviousExec(false), mCrashSettings("CrashSettings"), mSentCrashLogs(false), @@ -274,12 +274,19 @@ const char* const CRASH_SETTINGS_FILE = "settings_crash_behavior.xml"; S32 LLCrashLogger::loadCrashBehaviorSetting() { + // First check user_settings (in the user's home dir) std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE); + if (! mCrashSettings.loadFromFile(filename)) + { + // Next check app_settings (in the SL program dir) + std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, CRASH_SETTINGS_FILE); + mCrashSettings.loadFromFile(filename); + } - mCrashSettings.loadFromFile(filename); - + // If we didn't load any files above, this will return the default S32 value = mCrashSettings.getS32("CrashSubmitBehavior"); + // Whatever value we got, make sure it's valid switch (value) { case CRASH_BEHAVIOR_NEVER_SEND: @@ -391,14 +398,14 @@ bool LLCrashLogger::init() // Set the log file to crashreport.log LLError::logToFile(log_file); - mCrashSettings.declareS32("CrashSubmitBehavior", CRASH_BEHAVIOR_ASK, + mCrashSettings.declareS32("CrashSubmitBehavior", CRASH_BEHAVIOR_ALWAYS_SEND, "Controls behavior when viewer crashes " "(0 = ask before sending crash report, " "1 = always send crash report, " "2 = never send crash report)"); - llinfos << "Loading crash behavior setting" << llendl; - mCrashBehavior = loadCrashBehaviorSetting(); + // llinfos << "Loading crash behavior setting" << llendl; + // mCrashBehavior = loadCrashBehaviorSetting(); // If user doesn't want to send, bail out if (mCrashBehavior == CRASH_BEHAVIOR_NEVER_SEND) |