summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2011-08-06 14:28:53 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2011-08-06 14:28:53 +0300
commitef6e51db22ad3aec42b19bcf3e077ff000ba8929 (patch)
tree0099e5b3a9f04817afd7cbedf411188b9846c62e /indra/newview/llviewerregion.cpp
parent1b7b319ae22ac7598b7b3d75ccbec75263450e07 (diff)
SH-2170 FIXED Detecting selection of objects that cross parcel bounds added.
In this case the land impacts data is not displayed for such selection.
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r--indra/newview/llviewerregion.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 5be2234ec2..7ebfcc2b5a 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1784,6 +1784,11 @@ bool LLViewerRegion::childrenObjectReturnable( const std::vector<LLBBox>& boxes
return result;
}
+bool LLViewerRegion::objectsCrossParcel(const std::vector<LLBBox>& boxes) const
+{
+ return mParcelOverlay && mParcelOverlay->encroachesOnNearbyParcel(boxes);
+}
+
void LLViewerRegion::getNeighboringRegions( std::vector<LLViewerRegion*>& uniqueRegions )
{
mImpl->mLandp->getNeighboringRegions( uniqueRegions );