diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-19 09:59:03 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-19 09:59:03 -0400 |
commit | 8b8fdd0bdd3a26fc889ebdfac73d7805fda7123b (patch) | |
tree | dd1073ab359cfa71c23b22cf9e60ef16d9030998 /indra/newview/llviewerparceloverlay.h | |
parent | a6a0d5dda70de972ca1e386534284e2e93f29903 (diff) | |
parent | 3ce04f335e640ef9a00b00aae94ef2de841a1f7b (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 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; |