diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 4bfc2d40ddd1eb6efe1d7cff0d096fde4743889d..fb47cf30da153f9e03d469c93c579444594b6781 100644
--- 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);
@@ -473,13 +476,13 @@ bool LLCrashLogger::sendCrashLog(std::string dump_dir)
         msg = msg+mCrashHost.c_str();
         updateApplication(msg.c_str());
         
-		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)
 	{
         updateApplication("Using default server...");
-		sent = runCrashLogPost(mAltCrashHost, post_data, std::string("Sending to default server"), 3, 5);
+		sent = runCrashLogPost(mAltCrashHost, post_data, std::string("Sending to default server"), CRASH_UPLOAD_RETRIES, CRASH_UPLOAD_TIMEOUT);
 	}
     
 	mSentCrashLogs = sent;