diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-19 17:03:51 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-19 17:03:51 -0400 |
| commit | 9ed7cc297a7e5b0bb912fea26491b3dd6ee90814 (patch) | |
| tree | a7885484c66690879ae0b4ab1e37ba4965303bc4 /indra/newview/llviewerregion.h | |
| parent | bc400605cab6f353ab4b952a1056c6c22784d4d9 (diff) | |
| parent | af8864c49c4f9ca9421e3b259e8f51f0469ab7ce (diff) | |
merging in latest mesh-development
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 ); |