diff options
| author | Jonathan Yap <none@none> | 2014-03-06 09:20:54 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2014-03-06 09:20:54 -0500 |
| commit | a0f668c0a382ad4bd7a9be703bbcf1edd2bcf460 (patch) | |
| tree | 9da9b08465582432d12797951543a30d6c9fc2c1 /indra/newview/lltexturefetch.h | |
| parent | 672cc7049777b57a01a61428864ac6e3d10df321 (diff) | |
| parent | a5e56067c28298b4df0ef498303f78f67c35782c (diff) | |
STORM-68 merge
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* |