diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-28 12:14:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-28 12:14:27 -0700 |
| commit | 026b528b86a853a923ec87dd3897fe2079cbd539 (patch) | |
| tree | b31ec200f751a5c0817a6e628ae6e6c4f394bf77 /indra/llmath/v4color.h | |
| parent | ee74eb1a9ee8e2aba49613cf434f1272a4526417 (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llmath/v4color.h')
| -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 |