diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-24 14:02:51 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-24 14:02:51 +0200 |
commit | 1ef3fed827d7bcc901fc6e000033e45925f09b5c (patch) | |
tree | 7f282a0b2b828ea5f04d6c62b513c022f4071a1b /indra/newview/llvoclouds.cpp | |
parent | 172d9b21ab26927ec35a9210c4e9ce2ec24c9509 (diff) | |
parent | a7bca7055adbceee0fe09a6078158ffe8d0eacef (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvoclouds.cpp')
-rw-r--r-- | indra/newview/llvoclouds.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoclouds.cpp b/indra/newview/llvoclouds.cpp index 177cb16c50..5153cef709 100644 --- a/indra/newview/llvoclouds.cpp +++ b/indra/newview/llvoclouds.cpp @@ -77,9 +77,11 @@ BOOL LLVOClouds::isActive() const return TRUE; } - BOOL LLVOClouds::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) { + static LLFastTimer::DeclareTimer ftm("Idle Clouds"); + LLFastTimer t(ftm); + if (!(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_CLOUDS))) { return TRUE; |