indra/newview/llmeshrepository.cpp

changeset 40698
8daa5f3fcf2e
parent 40697
1909fb80b76f
child 40701
708f569ab46b
     1.1 --- a/indra/newview/llmeshrepository.cpp	Thu Jul 25 18:36:08 2013 -0400
     1.2 +++ b/indra/newview/llmeshrepository.cpp	Mon Jul 29 12:42:27 2013 -0400
     1.3 @@ -235,7 +235,8 @@
     1.4  const S32 REQUEST_LOW_WATER_MIN = 16;
     1.5  const S32 REQUEST_LOW_WATER_MAX = 40;
     1.6  const U32 LARGE_MESH_FETCH_THRESHOLD = 1U << 21;		// Size at which requests goes to narrow/slow queue
     1.7 -const long LARGE_MESH_XFER_TIMEOUT = 240L;				// Seconds to complete xfer
     1.8 +const long SMALL_MESH_XFER_TIMEOUT = 60L;				// Seconds to complete xfer, small mesh downloads
     1.9 +const long LARGE_MESH_XFER_TIMEOUT = 600L;				// Seconds to complete xfer, large downloads
    1.10  
    1.11  // Maximum mesh version to support.  Three least significant digits are reserved for the minor version, 
    1.12  // with major version changes indicating a format change that is not backwards compatible and should not
    1.13 @@ -629,6 +630,7 @@
    1.14  	mSignal = new LLCondition(NULL);
    1.15  	mHttpRequest = new LLCore::HttpRequest;
    1.16  	mHttpOptions = new LLCore::HttpOptions;
    1.17 +	mHttpOptions->setTransferTimeout(SMALL_MESH_XFER_TIMEOUT);
    1.18  	mHttpLargeOptions = new LLCore::HttpOptions;
    1.19  	mHttpLargeOptions->setTransferTimeout(LARGE_MESH_XFER_TIMEOUT);
    1.20  	mHttpHeaders = new LLCore::HttpHeaders;

mercurial