summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-01-11 16:32:47 -0800
committerRichard Linden <none@none>2013-01-11 16:32:47 -0800
commite0f2c608cf2bc724b7cb4a4443bb6a04c7069bf5 (patch)
tree923391e3fee69b7302f9c043f5ea0261e5146f02 /indra/newview/lltexturefetch.cpp
parent91a8383b4a0bbd2d48d2d84678f5bcc3701c2b9f (diff)
parentca21e13667a09a8ecdf1468995e38622867e907e (diff)
Automated merge with file:///c:%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 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()