summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparceloverlay.h
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2010-12-17 19:52:45 -0800
committerAndrew Meadows <andrew@lindenlab.com>2010-12-17 19:52:45 -0800
commit7fc9d701190a75c8f96a0a808d793dbc34860916 (patch)
tree9d4079adaad40a72b287c70ed22db0c86a223b76 /indra/newview/llviewerparceloverlay.h
parent3be87bb04685e971965ab5ac4166165c3785476f (diff)
For object-vs-parcel overlap we now use list of axis aligned boxes
one box for each prim, for less slop on queries
Diffstat (limited to 'indra/newview/llviewerparceloverlay.h')
-rw-r--r--indra/newview/llviewerparceloverlay.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerparceloverlay.h b/indra/newview/llviewerparceloverlay.h
index 4aa42eb8a4..c80baedda6 100644
--- a/indra/newview/llviewerparceloverlay.h
+++ b/indra/newview/llviewerparceloverlay.h
@@ -57,9 +57,9 @@ public:
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 bounding boxes
- // which isn't perfect, but is close
- bool encroachesOwned(const LLBBox& bbox) const;
+ // 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;