diff options
| author | Ankur Ahlawat <anchor@lindenlab.com> | 2018-01-17 15:53:56 -0800 |
|---|---|---|
| committer | Ankur Ahlawat <anchor@lindenlab.com> | 2018-01-17 15:53:56 -0800 |
| commit | 5a12a88f7b53bb99a6b302c35d891a8ecee59855 (patch) | |
| tree | dd52f7a9f76ac5d696a517f351371ceb619b7d30 /indra/newview/llviewerobject.cpp | |
| parent | d4ce47b09122d1f76601ba402c2b9ad6bb504950 (diff) | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 5de4029542..6c2d4d7fea 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -6281,18 +6281,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; } |