diff options
| author | Richard Linden <none@none> | 2012-11-07 15:32:12 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-07 15:32:12 -0800 |
| commit | ed17c181dd37f56b808838748d289ee7bb5567ec (patch) | |
| tree | f942d7b006510efea8b2626fdba41a575079ccdf /indra/llmath | |
| parent | 9d70448a1275b80a829e16b6d08d29919748c823 (diff) | |
SH-3499 WIP Ensure asset stats output is correct
further fixes to implicit conversion of unit types
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/v4color.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/v4color.h b/indra/llmath/v4color.h index b047f86e6e..78223e1e65 100644 --- a/indra/llmath/v4color.h +++ b/indra/llmath/v4color.h @@ -49,9 +49,9 @@ class LLColor4 LLColor4(); // Initializes LLColor4 to (0, 0, 0, 1) 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 LLColor3 &vec, F32 a = 1.f); // Initializes LLColor4 to (vec, a) + explicit LLColor4(U32 clr); // Initializes LLColor4 to (r=clr>>24, etc)) + explicit LLColor4(const F32 *vec); // Initializes LLColor4 to (vec[0]. vec[1], vec[2], 1) + explicit 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 explicit LLColor4(const LLVector4& vector4); // "explicit" to avoid automatic conversion |