diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-06 17:26:35 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-06 17:26:35 +0300 |
| commit | 7c09c648780d79cc240b76c9cb26e4bd1c0a8df2 (patch) | |
| tree | 8b3e147634a01efbe553aee1a27b422aed84b480 | |
| parent | eae82c8e4794e2d8374dd8d70547b00c5ac4f300 (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
Merged in lindenlab/viewer-bear
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rwxr-xr-x | indra/llcrashlogger/llcrashlogger.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -514,3 +514,4 @@ ae3297cdd03ab14f19f3811acbc4acd3eb600336 4.0.0-release 759710a9acef61aaf7b69f4bc4a5a913de87ad8a 4.0.1-release e9d350764dfbf5a46229e627547ef5c1b1eeef00 4.0.2-release 86dfba7ec4332c323025ebeacd8bf343ed0d8cfd 4.0.3-release +0a5de9ec2cb868f367501024d8d6958c20869053 4.0.4-release diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index bc9cbc9cf1..3e08fb4cf3 100755 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -56,6 +56,9 @@ BOOL gSent = false; int LLCrashLogger::ssl_mutex_count = 0; LLCoreInt::HttpMutex ** LLCrashLogger::ssl_mutex_list = NULL; +#define CRASH_UPLOAD_RETRIES 3 /* seconds */ +#define CRASH_UPLOAD_TIMEOUT 180 /* seconds */ + class LLCrashLoggerHandler : public LLHttpSDHandler { LOG_CLASS(LLCrashLoggerHandler); @@ -459,12 +462,12 @@ bool LLCrashLogger::sendCrashLog(std::string dump_dir) //*TODO: Translate if(mCrashHost != "") { - sent = runCrashLogPost(mCrashHost, post_data, std::string("Sending to server"), 3, 5); + sent = runCrashLogPost(mCrashHost, post_data, std::string("Sending to server"), CRASH_UPLOAD_RETRIES, CRASH_UPLOAD_TIMEOUT); } if(!sent) { - sent = runCrashLogPost(mAltCrashHost, post_data, std::string("Sending to alternate server"), 3, 5); + sent = runCrashLogPost(mAltCrashHost, post_data, std::string("Sending to alternate server"), CRASH_UPLOAD_RETRIES, CRASH_UPLOAD_TIMEOUT); } mSentCrashLogs = sent; diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index c5106e6d13..7636e75650 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -4.0.4 +4.0.5 |