diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-03 16:28:58 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-03 16:28:58 +0300 |
commit | e2135bd6dd7668560f5b3af5e1a7549488caa2ab (patch) | |
tree | a033e2809d98ebea2fa74a5808c235276f5f5df2 /indra/newview/pipeline.cpp | |
parent | b12201bf01caeef0f5a13951980be187ac3936c8 (diff) | |
parent | d10b9a7f37bec670342136eeea2c8c2604fdfeef (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7d0f763bd1..b578cb9f69 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7111,7 +7111,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) if (LLPipeline::sWaterReflections && assertInitialized() && LLDrawPoolWater::sNeedsReflectionUpdate) { BOOL skip_avatar_update = FALSE; - if (gAgentCamera.getCameraAnimating() || gAgentCamera.getCameraMode() != CAMERA_MODE_MOUSELOOK) + if (!isAgentAvatarValid() || gAgentCamera.getCameraAnimating() || gAgentCamera.getCameraMode() != CAMERA_MODE_MOUSELOOK) { skip_avatar_update = TRUE; } |