diff options
| author | Richard Linden <none@none> | 2013-01-09 23:08:32 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-09 23:08:32 -0800 |
| commit | 0f3411f2b4b95336dcc96950459396d780a43049 (patch) | |
| tree | 53b5a75c9fcd0bf1e65af1e3af795cbf2794d608 /indra/newview/lltexturefetch.cpp | |
| parent | a09719c0eb8d06d6bb689984a1b108932ea35314 (diff) | |
| parent | c539004c7ebec31d7e61209e7110ec96c867aaa6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-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 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() |