diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-06 14:00:26 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-06 14:00:26 -0400 |
| commit | 0a4b187301e1d5521dda7d2f157a94f02d597365 (patch) | |
| tree | 92cee20619bc5406670689bfa06bf9dc45c23bc4 /indra/newview/llviewerregion.h | |
| parent | a7076142429eb604e4f756223b70ff85a5ea3490 (diff) | |
| parent | 6095127468f91770abe276b7d55754bbec228df3 (diff) | |
merged .hgtags
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 ); |