diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-14 08:52:33 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-14 08:52:33 -0800 |
| commit | 64512b681e2f5582378d9943642a82c83cae30ac (patch) | |
| tree | 2ebc13a3426054c315a63e53d94ce7a45e9e1e63 /indra/llmath/llbbox.h | |
| parent | e040f16a4f2e50592a125a04185fd9f06ac49522 (diff) | |
ER-398 viewer's encroachment logic only uses bounding box of root prim
Adding LLBBox::join() to allow us to compute the bounding box of a linked object
Diffstat (limited to 'indra/llmath/llbbox.h')
| -rw-r--r-- | indra/llmath/llbbox.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llmath/llbbox.h b/indra/llmath/llbbox.h index a0d434b051..8616320381 100644 --- a/indra/llmath/llbbox.h +++ b/indra/llmath/llbbox.h @@ -83,7 +83,10 @@ public: LLVector3 agentToLocalBasis(const LLVector3& v) const; // Get the smallest possible axis aligned bbox that contains this bbox - LLBBox getAxisAligned() const; + LLBBox getAxisAligned() const; + + // Increases the size to contain other_box + void join(const LLBBox& other_box); // friend LLBBox operator*(const LLBBox& a, const LLMatrix4& b); |