summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-01-10 00:48:31 -0800
committerRichard Linden <none@none>2013-01-10 00:48:31 -0800
commit2ac49344e1aea94a11ecdb07ac6043538246a2f6 (patch)
treee268ef1a5116760093fe4f4e132c0e3c0a74ccdc /indra/newview/lltexturefetch.cpp
parentf8a2bca6526ea1eef61a9b8cf0fb2e78c2663d60 (diff)
parente28007f830a85b94adb7b787f18047780ac026ff (diff)
Automated merge with file:///d:%5Ccode%5Cviewer-interesting-metrics
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rw-r--r--indra/newview/lltexturefetch.cpp4
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()