diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2007-12-19 00:56:59 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2007-12-19 00:56:59 +0000 |
| commit | 7dd08303a3ebf9718c2c60a4d94b81d5d7845f8c (patch) | |
| tree | 6195a8585cc7998647afcaec2167e728e4abd3c1 /indra/llmath | |
| parent | 4d87303e78c1accde85b217b325e0c08930b0c4c (diff) | |
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llrect.h | 7 | ||||
| -rw-r--r-- | indra/llmath/v3color.h | 1 | ||||
| -rw-r--r-- | indra/llmath/v4color.h | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/indra/llmath/llrect.h b/indra/llmath/llrect.h index 00a1b03335..e7b15dcc58 100644 --- a/indra/llmath/llrect.h +++ b/indra/llmath/llrect.h @@ -215,7 +215,12 @@ public: mLeft = llmin(mLeft, mRight); mBottom = llmin(mBottom, mTop); } - + + bool isNull() const + { + return mLeft == mRight || mBottom == mTop; + } + void unionWith(const LLRectBase &other) { mLeft = llmin(mLeft, other.mLeft); diff --git a/indra/llmath/v3color.h b/indra/llmath/v3color.h index b80fa069c7..d09af7a8c4 100644 --- a/indra/llmath/v3color.h +++ b/indra/llmath/v3color.h @@ -163,6 +163,7 @@ inline LLColor3::LLColor3(F32 r, F32 g, F32 b) mV[VZ] = b; } + inline LLColor3::LLColor3(const F32 *vec) { mV[VX] = vec[VX]; diff --git a/indra/llmath/v4color.h b/indra/llmath/v4color.h index 1e6232fc9d..0514870ef6 100644 --- a/indra/llmath/v4color.h +++ b/indra/llmath/v4color.h @@ -260,6 +260,7 @@ inline LLColor4::LLColor4(U32 clr) mV[VW] = (clr>>24) * (1.0f/255.0f); } + inline LLColor4::LLColor4(const F32 *vec) { mV[VX] = vec[VX]; |