diff options
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/indra_constants.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llapr.cpp | 4 | ||||
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index 46f46e2433..a0fb086029 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -340,7 +340,7 @@ const U32 MAP_ITEM_CLASSIFIED = 0x08; // Crash reporter behavior const char* const CRASH_SETTINGS_FILE = "crash_settings.xml"; -const char* const CRASH_BEHAVIOR_SETTING = "CrashLogBehavior"; +const char* const CRASH_BEHAVIOR_SETTING = "CrashSubmitBehavior"; const S32 CRASH_BEHAVIOR_ASK = 0; const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1; const S32 CRASH_BEHAVIOR_NEVER_SEND = 2; diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp index 861cf814e2..3512f2fb17 100644 --- a/indra/llcommon/llapr.cpp +++ b/indra/llcommon/llapr.cpp @@ -293,6 +293,7 @@ bool ll_apr_file_remove(const LLString& filename, apr_pool_t* pool) if (s != APR_SUCCESS) { lldebugs << "ll_apr_file_remove failed on file: " << filename << llendl; + ll_apr_warn_status(s); return false; } return true; @@ -306,6 +307,7 @@ bool ll_apr_file_rename(const LLString& filename, const LLString& newname, apr_p if (s != APR_SUCCESS) { lldebugs << "ll_apr_file_rename failed on file: " << filename << llendl; + ll_apr_warn_status(s); return false; } return true; @@ -362,6 +364,7 @@ bool ll_apr_dir_make(const LLString& dirname, apr_pool_t* pool) if (s != APR_SUCCESS) { lldebugs << "ll_apr_dir_make failed on file: " << dirname << llendl; + ll_apr_warn_status(s); return false; } return true; @@ -375,6 +378,7 @@ bool ll_apr_dir_remove(const LLString& dirname, apr_pool_t* pool) if (s != APR_SUCCESS) { lldebugs << "ll_apr_dir_remove failed on file: " << dirname << llendl; + ll_apr_warn_status(s); return false; } return true; diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index 08edce4bc4..3c7232daa8 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -92,6 +92,8 @@ public: // newview specific FTM_MESSAGES, + FTM_MOUSEHANDLER, + FTM_KEYHANDLER, FTM_REBUILD, FTM_STATESORT, FTM_STATESORT_DRAWABLE, diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 415f17f068..c5bac32e91 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 19; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 0; +const S32 LL_VERSION_BUILD = 2; const char * const LL_CHANNEL = "Second Life Release"; |