From 7dd08303a3ebf9718c2c60a4d94b81d5d7845f8c Mon Sep 17 00:00:00 2001 From: Jon Wolk Date: Wed, 19 Dec 2007 00:56:59 +0000 Subject: svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134 --- indra/llmath/llrect.h | 7 ++++++- indra/llmath/v3color.h | 1 + indra/llmath/v4color.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'indra/llmath') 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]; -- cgit v1.3