diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 17:20:00 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 17:20:00 +0300 |
commit | 2a1b8318bd6b8175012df51e5b0eb18acee01d1b (patch) | |
tree | 4ad003b939788e1b6005f22f5b8a81fbef348da5 /indra/newview/pipeline.cpp | |
parent | fa3a77abdd2bd7218cc193f9d4d52a1ee73beb7d (diff) | |
parent | c8602b293517dfb4d5c6658ab235af9fe9932b7e (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; } |