diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-11-18 16:07:55 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-11-18 16:07:55 -0800 |
| commit | ce5baf14ac62ecd3bf471e1b49a4e166310ebe1a (patch) | |
| tree | 110869149fbc439487bb7ae0c49c24b938570b09 /indra/llmath | |
| parent | 125f3f071a30f4c47feb664b21f3e380ee4e7e49 (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llmath')
| -rwxr-xr-x | indra/llmath/v4color.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/v4color.h b/indra/llmath/v4color.h index b047f86e6e..8c8c315808 100755 --- a/indra/llmath/v4color.h +++ b/indra/llmath/v4color.h @@ -50,7 +50,7 @@ class LLColor4 LLColor4(F32 r, F32 g, F32 b); // Initializes LLColor4 to (r, g, b, 1) LLColor4(F32 r, F32 g, F32 b, F32 a); // Initializes LLColor4 to (r. g, b, a) LLColor4(U32 clr); // Initializes LLColor4 to (r=clr>>24, etc)) - LLColor4(const F32 *vec); // Initializes LLColor4 to (vec[0]. vec[1], vec[2], 1) + LLColor4(const F32 *vec); // Initializes LLColor4 to (vec[0]. vec[1], vec[2], vec[3]) LLColor4(const LLColor3 &vec, F32 a = 1.f); // Initializes LLColor4 to (vec, a) explicit LLColor4(const LLSD& sd); explicit LLColor4(const LLColor4U& color4u); // "explicit" to avoid automatic conversion |