diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2011-08-19 02:20:07 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2011-08-19 02:20:07 +0300 |
| commit | 27332685e9617f331866f8b11a6389eff88cc28e (patch) | |
| tree | 0df909c7cf89c41801303196f947d18d157bb419 /indra/newview/llviewerregion.cpp | |
| parent | 299a01470402de0327fc7f839e5937fc6b60bf63 (diff) | |
| parent | 94f3432871d8512d04447cec3345694bf04537c9 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index a7fac0e29d..ad188a4075 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1783,6 +1783,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 ); |