diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-17 10:30:36 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-17 10:30:36 -0500 |
| commit | 74fdba829574e5132fec6633b0ddcd2feb9fe51e (patch) | |
| tree | bf17dba56b38a3b228f6174f950e3d405b6329af /indra/newview/llviewerparceloverlay.h | |
| parent | fe28f89e7e79b9de5a455b9c9833d243d8039774 (diff) | |
| parent | 1d7b46e2c32c6bdf2e6cf5a8b9dcb0c8cb767b1b (diff) | |
merge changes for vwr-24420
Diffstat (limited to 'indra/newview/llviewerparceloverlay.h')
| -rw-r--r-- | indra/newview/llviewerparceloverlay.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerparceloverlay.h b/indra/newview/llviewerparceloverlay.h index 61be220312..c80baedda6 100644 --- a/indra/newview/llviewerparceloverlay.h +++ b/indra/newview/llviewerparceloverlay.h @@ -30,6 +30,7 @@ // The ownership data for land parcels. // One of these structures per region. +#include "llbbox.h" #include "lldarray.h" #include "llframetimer.h" #include "lluuid.h" @@ -54,6 +55,12 @@ public: BOOL isOwnedSelf(const LLVector3& pos) const; BOOL isOwnedGroup(const LLVector3& pos) const; BOOL isOwnedOther(const LLVector3& pos) const; + + // "encroaches" means the prim hangs over the parcel, but its center + // 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 isSoundLocal(const LLVector3& pos) const; BOOL isBuildCameraAllowed(const LLVector3& pos) const; |