diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-06 08:29:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-06 08:29:55 -0500 |
| commit | a40c6faf2e532c3009d400623e3f999d756680c7 (patch) | |
| tree | 735f80eaf82f55d627e1de49e7de71b9e289bebc /indra/newview/lltexturefetch.h | |
| parent | ef794e7ffcfbf672e7115fc91f45f0e8340fdad5 (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
merge changes for 3.7.2-release
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* |