diff options
author | Richard Linden <none@none> | 2013-08-14 16:10:17 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-08-14 16:10:17 -0700 |
commit | bceb1e8abe916cd69e7ac6ab70dc03dc6d76c9df (patch) | |
tree | 0016163049097d6b55a065b8fafdc609f1879c54 /indra/newview/llviewerassetstats.cpp | |
parent | 52086d4485e004999d097cb66fb5cf63e34203d2 (diff) | |
parent | 26581404e426b00cd0a07c38b5cb858d5d5faa28 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerassetstats.cpp')
-rwxr-xr-x | indra/newview/llviewerassetstats.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetstats.cpp b/indra/newview/llviewerassetstats.cpp index 579567bb14..b176c69691 100755 --- a/indra/newview/llviewerassetstats.cpp +++ b/indra/newview/llviewerassetstats.cpp @@ -233,7 +233,7 @@ namespace LLViewerAssetStatsFF &sDequeuedAssetRequestsOther }; - static LLTrace::EventStatHandle<LLUnit<F64, LLUnits::Seconds> > sResponseAssetRequestsTempTextureHTTP ("assetresponsetimestemptexturehttp", + static LLTrace::EventStatHandle<LLUnits::F64Seconds > sResponseAssetRequestsTempTextureHTTP ("assetresponsetimestemptexturehttp", "Time spent responding to temporary texture asset http requests"), sResponseAssetRequestsTempTextureUDP ("assetresponsetimestemptextureudp", "Time spent responding to temporary texture asset udp requests"), @@ -250,7 +250,7 @@ namespace LLViewerAssetStatsFF sResponsedAssetRequestsOther ("assetresponsetimesother", "Time spent responding to other asset requests"); - static LLTrace::EventStatHandle<LLUnit<F64, LLUnits::Seconds> >* sResponse[EVACCount] = { + static LLTrace::EventStatHandle<LLUnits::F64Seconds >* sResponse[EVACCount] = { &sResponseAssetRequestsTempTextureHTTP, &sResponseAssetRequestsTempTextureUDP, &sResponseAssetRequestsNonTempTextureHTTP, |