From ecc3f3916e012820be9580b2457ade2efb351a14 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Wed, 28 Mar 2012 23:47:52 +0200
Subject: [PATCH] Increase timeout of merchant outbox fetching to 2 minutes;
 martketplace is often rather slow to respond.

---
 indra/newview/llmarketplacefunctions.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index baf1ee11ab..20468ddd69 100644
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -261,7 +261,11 @@ namespace LLMarketplaceImport
 		}
 
 		slmGetTimer.start();
-		LLHTTPClient::get(url, new LLImportGetResponder(), LLViewerMedia::getHeaders());
+
+		// <FS:ND> Bump timeout to 2 minutes. Marketplace can be really slow ...
+		//		LLHTTPClient::get(url, new LLImportGetResponder(), LLViewerMedia::getHeaders());
+		LLHTTPClient::get(url, new LLImportGetResponder(), LLViewerMedia::getHeaders(), 2*60);
+		// </FS:ND>
 		
 		return true;
 	}