livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-418: Reconcile new code with new Alex Ivy LLPipeline API.

master
Nat Goodspeed 2017-05-23 09:10:51 -04:00
parent fe64db61d6
commit cf5865c6e2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llviewerobject.cpp
View File

@ -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;
}