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/llviewerparceloverlay.h | |
| parent | 299a01470402de0327fc7f839e5937fc6b60bf63 (diff) | |
| parent | 94f3432871d8512d04447cec3345694bf04537c9 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerparceloverlay.h')
| -rw-r--r-- | indra/newview/llviewerparceloverlay.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerparceloverlay.h b/indra/newview/llviewerparceloverlay.h index 3c6794e7d0..7445d5bf1d 100644 --- a/indra/newview/llviewerparceloverlay.h +++ b/indra/newview/llviewerparceloverlay.h @@ -61,6 +61,7 @@ public: // bounding boxes which isn't perfect, but is close bool encroachesOwned(const std::vector<LLBBox>& boxes) const; bool encroachesOnUnowned(const std::vector<LLBBox>& boxes) const; + bool encroachesOnNearbyParcel(const std::vector<LLBBox>& boxes) const; BOOL isSoundLocal(const LLVector3& pos) const; |