From cf5865c6e2b27918b526431ccc4309bfc702534e Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 23 May 2017 09:10:51 -0400
Subject: [PATCH] DRTVWR-418: Reconcile new code with new Alex Ivy LLPipeline
API.
---
indra/newview/llviewerobject.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 1d6daed9cc0..9299e60b1cb 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -6276,18 +6276,18 @@ BOOL LLViewerObject::isTempAttachment() const
BOOL LLViewerObject::isHiglightedOrBeacon() const
{
- if (LLFloaterReg::instanceVisible("beacons") && (gPipeline.getRenderBeacons(NULL) || gPipeline.getRenderHighlights(NULL)))
+ if (LLFloaterReg::instanceVisible("beacons") && (gPipeline.getRenderBeacons() || gPipeline.getRenderHighlights()))
{
BOOL has_media = (getMediaType() == LLViewerObject::MEDIA_SET);
BOOL is_scripted = !isAvatar() && !getParent() && flagScripted();
BOOL is_physical = !isAvatar() && flagUsePhysics();
- return (isParticleSource() && gPipeline.getRenderParticleBeacons(NULL))
- || (isAudioSource() && gPipeline.getRenderSoundBeacons(NULL))
- || (has_media && gPipeline.getRenderMOAPBeacons(NULL))
- || (is_scripted && gPipeline.getRenderScriptedBeacons(NULL))
- || (is_scripted && flagHandleTouch() && gPipeline.getRenderScriptedTouchBeacons(NULL))
- || (is_physical && gPipeline.getRenderPhysicalBeacons(NULL));
+ return (isParticleSource() && gPipeline.getRenderParticleBeacons())
+ || (isAudioSource() && gPipeline.getRenderSoundBeacons())
+ || (has_media && gPipeline.getRenderMOAPBeacons())
+ || (is_scripted && gPipeline.getRenderScriptedBeacons())
+ || (is_scripted && flagHandleTouch() && gPipeline.getRenderScriptedTouchBeacons())
+ || (is_physical && gPipeline.getRenderPhysicalBeacons());
}
return FALSE;
}
--
GitLab