diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2022-04-18 21:56:26 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2022-04-18 21:56:26 +0000 |
| commit | e71201ac125cab5f3d3cf7d6a30500253fc29d90 (patch) | |
| tree | 270e46eb85dd46fb6962a36a9357dbf31c3afb29 /indra/newview/pipeline.cpp | |
| parent | 2d63d2044e0a00d1969c3da254e016a6e520c0d5 (diff) | |
| parent | 035b1996df3f357b5060e3eb778588da5b9e7b37 (diff) | |
Merged in DV528-merge-6.5.5 (pull request #945)
DRTVWR-528 merge up to 6.5.5
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index cd1b9c7c69..d797b64731 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7154,6 +7154,7 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector4a& start, { if ((j == LLViewerRegion::PARTITION_VOLUME) || (j == LLViewerRegion::PARTITION_BRIDGE) || + (j == LLViewerRegion::PARTITION_AVATAR) || // for attachments (j == LLViewerRegion::PARTITION_CONTROL_AV) || (j == LLViewerRegion::PARTITION_TERRAIN) || (j == LLViewerRegion::PARTITION_TREE) || |