diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2011-01-07 15:22:33 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2011-01-07 15:22:33 -0800 |
| commit | 1b7bd5e2d0d8f3c8f31c037aae8f46b1377178fd (patch) | |
| tree | f4a4d2bd79cda3b8c4f787d7cedd92bd7358c70b /indra/llmath | |
| parent | d23f7df822b6c0557f9426b5e1aa660b77aba01e (diff) | |
| parent | d12b7b347ad4094b96ba2a650ae86dfb9db2a893 (diff) | |
merge
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llbbox.cpp | 1 | ||||
| -rw-r--r-- | indra/llmath/llbbox.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/indra/llmath/llbbox.cpp b/indra/llmath/llbbox.cpp index 72c906b5ca..d2208f604e 100644 --- a/indra/llmath/llbbox.cpp +++ b/indra/llmath/llbbox.cpp @@ -103,7 +103,6 @@ LLBBox LLBBox::getAxisAligned() const return aligned; } - void LLBBox::expand( F32 delta ) { mMinLocal.mV[VX] -= delta; diff --git a/indra/llmath/llbbox.h b/indra/llmath/llbbox.h index a0d434b051..28e69b75e1 100644 --- a/indra/llmath/llbbox.h +++ b/indra/llmath/llbbox.h @@ -83,8 +83,7 @@ public: LLVector3 agentToLocalBasis(const LLVector3& v) const; // Get the smallest possible axis aligned bbox that contains this bbox - LLBBox getAxisAligned() const; - + LLBBox getAxisAligned() const; // friend LLBBox operator*(const LLBBox& a, const LLMatrix4& b); |