diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-10-05 15:12:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-10-05 15:12:07 -0700 |
| commit | 11a0d0cd59c86cee18b6b2fd92fcbac62502ede0 (patch) | |
| tree | 74dba5131b40874232a8dd50a2a79f9d81d3f143 /indra/newview/llviewerregion.h | |
| parent | 6f9ed8b303e9e840fcd624b03ec0958dceba3dc7 (diff) | |
| parent | eda12bd009d8f71eb82b6e6238335a172d6e5fb0 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rw-r--r-- | indra/newview/llviewerregion.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index ef1a6d285c..c483c6ef52 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -322,6 +322,7 @@ public: bool objectIsReturnable(const LLVector3& pos, const std::vector<LLBBox>& boxes) const; bool childrenObjectReturnable( const std::vector<LLBBox>& boxes ) const; + bool objectsCrossParcel(const std::vector<LLBBox>& boxes) const; void getNeighboringRegions( std::vector<LLViewerRegion*>& uniqueRegions ); |