diff options
| author | simon <none@none> | 2014-02-25 16:47:31 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-25 16:47:31 -0800 |
| commit | dd8b32473e652c2d3193c78db21b06ba25e28b67 (patch) | |
| tree | 8ef6965a7e785388860893a85cffaef04eec2b9e /indra/newview/lltexturefetch.h | |
| parent | 76913530ed04798536e8469dbeaea9e512d122aa (diff) | |
| parent | 6f1df3172ebf377ac0f303022c930a0a1da2ed43 (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* |