diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-06 16:43:19 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-06 16:43:19 -0500 |
| commit | fba8afd7b27ebc362af7b26b1f1fb2917deae920 (patch) | |
| tree | 6a2038a25a643dd2e6ba0b681e27667626ae719e /indra/newview | |
| parent | a90ea46804d1fdb60d44178140b12e341c715178 (diff) | |
SH-2454 Fix for attachments casting shadows/showing up in water when "show me in mouselook" is disabled
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/pipeline.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 83f9863224..d28bb1f64e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7612,11 +7612,11 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) if (LLPipeline::sWaterReflections && assertInitialized() && LLDrawPoolWater::sNeedsReflectionUpdate) { BOOL skip_avatar_update = FALSE; - if (!isAgentAvatarValid() || gAgentCamera.getCameraAnimating() || gAgentCamera.getCameraMode() != CAMERA_MODE_MOUSELOOK) + if (!isAgentAvatarValid() || gAgentCamera.getCameraAnimating() || gAgentCamera.getCameraMode() != CAMERA_MODE_MOUSELOOK || !LLVOAvatar::sVisibleInFirstPerson) { skip_avatar_update = TRUE; } - + if (!skip_avatar_update) { gAgentAvatarp->updateAttachmentVisibility(CAMERA_MODE_THIRD_PERSON); @@ -8301,7 +8301,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera) } BOOL skip_avatar_update = FALSE; - if (!isAgentAvatarValid() || gAgentCamera.getCameraAnimating() || gAgentCamera.getCameraMode() != CAMERA_MODE_MOUSELOOK) + if (!isAgentAvatarValid() || gAgentCamera.getCameraAnimating() || gAgentCamera.getCameraMode() != CAMERA_MODE_MOUSELOOK || !LLVOAvatar::sVisibleInFirstPerson) { skip_avatar_update = TRUE; } |