diff options
| author | Richard Linden <none@none> | 2013-01-10 00:12:57 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-10 00:12:57 -0800 |
| commit | e28007f830a85b94adb7b787f18047780ac026ff (patch) | |
| tree | 2f72c0a29dadea66d95ac7ac6646b93311b85a9c /indra/newview/lltexturefetch.cpp | |
| parent | 8c73ff245cee8da2ca75c5651be88a36358a5dae (diff) | |
| parent | beb431c7834f49d8e6b5304f7b60fb1f1b3b4afe (diff) | |
Automated merge with file:///d:%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 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() |