summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNicky <sl.nicky.ml@googlemail.com>2016-04-24 12:55:50 +0200
committerNicky <sl.nicky.ml@googlemail.com>2016-04-24 12:55:50 +0200
commit944c497090b09e30377a67d60049c641b5e10e55 (patch)
tree9df33f1b20fe538ac0dd7275de23c69fd0cb8f4d /indra
parentc4e21cf2828517e761657eb70bf516d84f17fc77 (diff)
Code stylistics.
(transplanted from 570ea799407270069974021eca3a5056d6908f58)
Diffstat (limited to 'indra')
-rw-r--r--indra/llmath/v4coloru.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/llmath/v4coloru.h b/indra/llmath/v4coloru.h
index 31ae3e3c1a..704ce852d9 100644
--- a/indra/llmath/v4coloru.h
+++ b/indra/llmath/v4coloru.h
@@ -563,19 +563,9 @@ void LLColor4U::setVecScaleClamp(const LLColor3& color)
inline U32 LLColor4U::asRGBA() const
{
- U32 nRet( 0 );
-
// Little endian: values are swapped in memory. The original code access the array like a U32, so we need to swap here
- nRet |= mV[ 3 ];
- nRet <<= 8;
- nRet |= mV[ 2 ];
- nRet <<= 8;
- nRet |= mV[ 1 ];
- nRet <<= 8;
- nRet |= mV[ 0 ];
-
- return nRet;
+ return (mV[3] << 24) | (mV[2] << 16) | (mV[1] << 8) | mV[0];
}
inline void LLColor4U::fromRGBA( U32 aVal )