diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-11-04 11:53:49 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-11-04 11:53:49 -0500 |
| commit | 8188a8c410807debd2d7d40d0299c36b92e56ca3 (patch) | |
| tree | 68a586a4f32bfd1f395c4942701813e002047622 /indra/llmath | |
| parent | 2dbf6569a77c37d7c7ecc684dd417ddbbb7c6bab (diff) | |
| parent | 6ed4c84a30e8f4044ccaedba114e13e07ae5c46d (diff) | |
merge
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 |