diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2013-01-08 14:50:31 -0700 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2013-01-08 14:50:31 -0700 |
commit | 8315e9745398c1c3215ffe1b3bfbfb6c7d16291d (patch) | |
tree | 6e894381a62c0fb8656d2e0720b62d1beda3c06e /indra/newview/lltexturefetch.cpp | |
parent | 68413515029f50713c70e4adec3ce6fd1022d59f (diff) | |
parent | 1fbd45672fcb1e5bfc194712fc7d0d4847a651cd (diff) |
Merge
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rw-r--r-- | indra/newview/lltexturefetch.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 9f1c7855be..01f9151ab4 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -2358,6 +2358,10 @@ LLTextureFetch::LLTextureFetch(LLTextureCache* cache, LLImageDecodeThread* image mHttpMetricsHeaders = new LLCore::HttpHeaders; mHttpMetricsHeaders->mHeaders.push_back("Content-Type: application/llsd+xml"); mHttpPolicyClass = LLAppViewer::instance()->getAppCoreHttp().getPolicyDefault(); + + //reset the texture timer. + gTextureTimer.reset(); + gTextureTimer.pause(); } LLTextureFetch::~LLTextureFetch() |