diff options
| author | Richard Linden <none@none> | 2013-01-11 10:27:03 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-11 10:27:03 -0800 |
| commit | 17c051f965e05a8a91d4a93b641084869897fe71 (patch) | |
| tree | 1227bfab5e2039b2d78061adbd549e8481ce4fdc /indra/newview/lltexturefetch.cpp | |
| parent | 62a9f557d2e91beb685843775e8f9fe73dab4b94 (diff) | |
| parent | efa6be575c184a885d2b7e6f2142db6777668343 (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() |