Fixups for the transplant of the HttpHeader changes from sunshine.

Wed, 19 Jun 2013 19:58:09 +0000

author
Monty Brandenberg <monty@lindenlab.com>
date
Wed, 19 Jun 2013 19:58:09 +0000
changeset 40684
f110aa675d5e
parent 40683
5e594bc74503
child 40685
6335fca454a8

Fixups for the transplant of the HttpHeader changes from sunshine.

indra/newview/llmeshrepository.cpp file | annotate | diff | revisions
indra/newview/lltexturefetch.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llmeshrepository.cpp	Mon Apr 15 16:55:35 2013 +0000
     1.2 +++ b/indra/newview/llmeshrepository.cpp	Wed Jun 19 19:58:09 2013 +0000
     1.3 @@ -573,7 +573,7 @@
     1.4  	mHttpLargeOptions = new LLCore::HttpOptions;
     1.5  	mHttpLargeOptions->setTransferTimeout(LARGE_MESH_XFER_TIMEOUT);
     1.6  	mHttpHeaders = new LLCore::HttpHeaders;
     1.7 -	mHttpHeaders->mHeaders.push_back("Accept: application/vnd.ll.mesh");
     1.8 +	mHttpHeaders->append("Accept", "application/vnd.ll.mesh");
     1.9  	mHttpPolicyClass = LLAppViewer::instance()->getAppCoreHttp().getPolicy(LLAppCoreHttp::AP_MESH);
    1.10  	mHttpPolicyClass = LLAppViewer::instance()->getAppCoreHttp().getPolicy(LLAppCoreHttp::AP_LARGE_MESH);
    1.11  }
     2.1 --- a/indra/newview/lltexturefetch.cpp	Mon Apr 15 16:55:35 2013 +0000
     2.2 +++ b/indra/newview/lltexturefetch.cpp	Wed Jun 19 19:58:09 2013 +0000
     2.3 @@ -2410,9 +2410,9 @@
     2.4  	mHttpOptionsWithHeaders = new LLCore::HttpOptions;
     2.5  	mHttpOptionsWithHeaders->setWantHeaders(true);
     2.6  	mHttpHeaders = new LLCore::HttpHeaders;
     2.7 -	mHttpHeaders->append(HTTP_OUT_HEADER_ACCEPT, HTTP_CONTENT_IMAGE_X_J2C);
     2.8 +	mHttpHeaders->append("Accept", "image/x-j2c");
     2.9  	mHttpMetricsHeaders = new LLCore::HttpHeaders;
    2.10 -	mHttpMetricsHeaders->append(HTTP_OUT_HEADER_CONTENT_TYPE, HTTP_CONTENT_LLSD_XML);
    2.11 +	mHttpMetricsHeaders->append("Content-Type", "application/llsd+xml");
    2.12  	mHttpPolicyClass = LLAppViewer::instance()->getAppCoreHttp().getPolicy(LLAppCoreHttp::AP_TEXTURE);
    2.13  }
    2.14  
    2.15 @@ -4050,7 +4050,7 @@
    2.16  	if (! mHttpHeaders)
    2.17  	{
    2.18  		mHttpHeaders = new LLCore::HttpHeaders;
    2.19 -		mHttpHeaders->append(HTTP_OUT_HEADER_ACCEPT, HTTP_CONTENT_IMAGE_X_J2C);
    2.20 +		mHttpHeaders->append("Accept", "image/x-j2c");
    2.21  	}
    2.22  }
    2.23  

mercurial