diff options
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/v3color.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/v3color.h b/indra/llmath/v3color.h index 38c0d68417..179687a32e 100644 --- a/indra/llmath/v3color.h +++ b/indra/llmath/v3color.h @@ -57,7 +57,7 @@ public: LLColor3(); // Initializes LLColor3 to (0, 0, 0) LLColor3(F32 r, F32 g, F32 b); // Initializes LLColor3 to (r, g, b) LLColor3(const F32 *vec); // Initializes LLColor3 to (vec[0]. vec[1], vec[2]) - LLColor3(char *color_string); // html format color ie "#FFDDEE" + LLColor3(const char *color_string); // html format color ie "#FFDDEE" explicit LLColor3(const LLColor4& color4); // "explicit" to avoid automatic conversion explicit LLColor3(const LLVector4& vector4); // "explicit" to avoid automatic conversion LLColor3(const LLSD& sd); @@ -189,7 +189,7 @@ inline LLColor3::LLColor3(const F32 *vec) # pragma warning( disable : 4996 ) // strncpy teh sux0r #endif -inline LLColor3::LLColor3(char* color_string) // takes a string of format "RRGGBB" where RR is hex 00..FF +inline LLColor3::LLColor3(const char* color_string) // takes a string of format "RRGGBB" where RR is hex 00..FF { if (strlen(color_string) < 6) /* Flawfinder: ignore */ { @@ -199,7 +199,7 @@ inline LLColor3::LLColor3(char* color_string) // takes a string of format "RRGGB return; } - static char tempstr[7]; /* Flawfinder: ignore */ + char tempstr[7]; strncpy(tempstr,color_string,6); /* Flawfinder: ignore */ tempstr[6] = '\0'; mV[VZ] = (F32)strtol(&tempstr[4],NULL,16)/255.f; |