diff options
| author | Richard Linden <none@none> | 2013-01-11 15:46:18 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-11 15:46:18 -0800 |
| commit | ca21e13667a09a8ecdf1468995e38622867e907e (patch) | |
| tree | e9163e324a66e84ae73bbce11dc35f572834b339 /indra/newview/lltexturefetch.cpp | |
| parent | 512d7381eca7bc53bb31e9528e5a7c5df189e82d (diff) | |
| parent | 433d53ea5580b2cbb17e6397afe2ca008e466963 (diff) | |
Automated merge with file:///c:%5Ccode%5Cviewer-interesting-metrics
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 d62101d159..fba636e8ef 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() |