diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-14 10:17:10 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-14 10:17:10 -0400 |
| commit | 6ce6ce238c68f7a6c99fef2baed9420caf09f848 (patch) | |
| tree | 4291aa0cde0c982028382744fc236180245f23aa /indra/newview/pipeline.cpp | |
| parent | c5356935354013530432cfb07556902a039020a9 (diff) | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
automated merge
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; } |