summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-07-12 13:35:21 -0700
committerMonroe Linden <monroe@lindenlab.com>2010-07-12 13:35:21 -0700
commit68982388d365b779e1f68e7e40fc71c11e278061 (patch)
tree85219c73df96dd3c5577bc1e16ad9480f56226f2
parenta2b9af626f2faa486a4fea13f10f1c8c2cc069c0 (diff)
Fix for EXT-8314
Made LLPipeline::generateWaterReflection() not try to call LLVOAvatarSelf::updateAttachmentVisibility() if isAgentAvatarValid() returns false. Reviewed by Nyx at http://codereview.lindenlab.com/2585007
-rw-r--r--indra/newview/pipeline.cpp2
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;
}