diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-29 14:32:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-29 14:32:37 +0300 |
| commit | 2ee039c736f64c91bb4f16e403360cddb0089707 (patch) | |
| tree | e565fac793bebb6d97fb6f2ec35bc484615a749f /indra/llmath | |
| parent | e687250b90e63e71c9115ed97c3efd60ceefbcb6 (diff) | |
| parent | 3e322df4fb71cbeff27aab85bb48c7da595b548c (diff) | |
Merge branch 'develop' into marchcat/b-develop
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/v3color.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llmath/v3color.h b/indra/llmath/v3color.h index 821c17f03d..f7af469e66 100644 --- a/indra/llmath/v3color.h +++ b/indra/llmath/v3color.h @@ -209,10 +209,6 @@ inline LLColor3::LLColor3(const F32 *vec) mV[VBLUE] = vec[VBLUE]; } -#if LL_WINDOWS -# pragma warning( disable : 4996 ) // strncpy teh sux0r -#endif - 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 */ |