diff options
| author | Richard Linden <none@none> | 2013-01-10 19:26:58 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-10 19:26:58 -0800 |
| commit | efa6be575c184a885d2b7e6f2142db6777668343 (patch) | |
| tree | 1822b8aa43e58ac9ce7a33db69668ecaf844f15d /indra/newview/lltexturefetch.cpp | |
| parent | 826dbe08ffb1eee2428184641a61615c8375c95c (diff) | |
| parent | 840540be186904b1e711d79dede0c771c967950c (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 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() |