diff options
author | Richard Linden <none@none> | 2013-01-11 14:52:31 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-01-11 14:52:31 -0800 |
commit | 433d53ea5580b2cbb17e6397afe2ca008e466963 (patch) | |
tree | 50e13b5949d96e4ea5e0bdcb113458ad7dbbf4b4 /indra/newview/lltexturefetch.cpp | |
parent | 85df1df3c34115efa0e18d116f7923b88ec1dadf (diff) | |
parent | a3d07fd4c27e527edfb901b25b5857d3fd7d2eaf (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() |