diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2012-08-03 14:49:49 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2012-08-03 14:49:49 -0400 |
commit | 0664cb1512481b9cd9f5ef4bc398c88416b246a9 (patch) | |
tree | 552a1d8207942c08ae379dfa916b2e5afcd3912e /indra/newview/llviewertexturelist.cpp | |
parent | bf004be1023347bcabaae6baa1624b2ed78d69fd (diff) | |
parent | 7d98d1afb036ce4b221e101e6de153a3d978ba9f (diff) |
Automated merge with ssh://hg.lindenlab.com/monty/viewer-drano-http
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
-rw-r--r-- | indra/newview/llviewertexturelist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 528e0080b7..9a6c0569a9 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -705,7 +705,7 @@ void LLViewerTextureList::updateImagesDecodePriorities() // Flush formatted images using a lazy flush // const F32 LAZY_FLUSH_TIMEOUT = 30.f; // stop decoding - const F32 MAX_INACTIVE_TIME = 50.f; // actually delete + const F32 MAX_INACTIVE_TIME = 20.f; // actually delete S32 min_refs = 3; // 1 for mImageList, 1 for mUUIDMap, 1 for local reference S32 num_refs = imagep->getNumRefs(); |