summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-05-02 21:59:53 +0000
committerMonty Brandenberg <monty@lindenlab.com>2013-05-02 21:59:53 +0000
commit11cca95187f01f594172ca950315dcd8d99dc2c3 (patch)
tree06656459742465e6cb77cb914d27c637fb07a96f /indra/newview
parentb833f574bc20d4371b78f9c6b02bafe460a2e359 (diff)
SH-4161 Integrate cpu metrics into LLDeadmanTimer and then metrics viewer
Integrated as a ctor-time option to LLDeadmanTimer and have mesh use this mode for the stats I'm gathering.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llmeshrepository.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 0f33128057..2a863a3103 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -96,7 +96,7 @@ U32 LLMeshRepository::sLODPending = 0;
U32 LLMeshRepository::sCacheBytesRead = 0;
U32 LLMeshRepository::sCacheBytesWritten = 0;
U32 LLMeshRepository::sPeakKbps = 0;
-LLDeadmanTimer LLMeshRepository::sQuiescentTimer(15.0);
+LLDeadmanTimer LLMeshRepository::sQuiescentTimer(15.0, true);
const U32 MAX_TEXTURE_UPLOAD_RETRIES = 5;