summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llrect.h7
-rw-r--r--indra/llmath/v3color.h1
-rw-r--r--indra/llmath/v4color.h1
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];