diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-05-06 08:56:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-05-06 08:56:31 -0400 |
| commit | 94559950a2c670990db56bd74e65d26652421b8c (patch) | |
| tree | 459f02f343ef284119aca228facd6b93eb5ebce8 /indra | |
| parent | 1114d681f1c34cbe07d6607fdc2d78036c42da2c (diff) | |
increment viewer version to 4.0.5
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llcrashlogger/llcrashlogger.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 |
2 files changed, 6 insertions, 3 deletions
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 |