diff options
author | Richard Linden <none@none> | 2011-08-11 10:09:28 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-08-11 10:09:28 -0700 |
commit | 9a9e78740ada6a64847d1e915ae8e92258e8f10a (patch) | |
tree | 43935b338c5a87ca32f9240389470a96271fa1f5 /indra/newview/llviewerparceloverlay.h | |
parent | 8b09dfb8907c364f09ee82d00926219ae52b5ee9 (diff) | |
parent | 7cc7d143837f2b75f750c139e33fdf5afa8a8866 (diff) |
Automated merge with file:///e:\code\viewer-experience
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 c80baedda6..3c6794e7d0 100644 --- a/indra/newview/llviewerparceloverlay.h +++ b/indra/newview/llviewerparceloverlay.h @@ -60,6 +60,7 @@ public: // might be in another parcel. for now, we simply test axis aligned // 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 isSoundLocal(const LLVector3& pos) const; |