diff options
| author | simon <none@none> | 2014-02-25 16:59:46 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-25 16:59:46 -0800 |
| commit | 43e36b7ee328f49149292f27cc5621238d03ac26 (patch) | |
| tree | 2d46556a050699dee527e0ebbf82260e27bae793 /indra/newview/lltexturefetch.h | |
| parent | 5705a2c0181a9376db5eadf6ccf97e0675f6afb5 (diff) | |
| parent | dd8b32473e652c2d3193c78db21b06ba25e28b67 (diff) | |
Merge downstream code
Diffstat (limited to 'indra/newview/lltexturefetch.h')
| -rwxr-xr-x | indra/newview/lltexturefetch.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h index 902a3d7a25..3c79a5a24d 100755 --- a/indra/newview/lltexturefetch.h +++ b/indra/newview/lltexturefetch.h @@ -4,7 +4,7 @@ * * $LicenseInfo:firstyear=2000&license=viewerlgpl$ * Second Life Viewer Source Code - * Copyright (C) 2012, Linden Research, Inc. + * Copyright (C) 2012-2013, Linden Research, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -351,6 +351,7 @@ private: // LLCurl interfaces used in the past. LLCore::HttpRequest * mHttpRequest; // Ttf LLCore::HttpOptions * mHttpOptions; // Ttf + LLCore::HttpOptions * mHttpOptionsWithHeaders; // Ttf LLCore::HttpHeaders * mHttpHeaders; // Ttf LLCore::HttpHeaders * mHttpMetricsHeaders; // Ttf LLCore::HttpRequest::policy_t mHttpPolicyClass; // T* |