From 598c953d540090caa8a9a12581a4ab8ae52615dd Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 12 Oct 2022 18:49:18 -0500 Subject: SL-18190 Fix for assert on 360 snapshot and ? fix for mac build ? --- indra/llmath/v3color.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llmath') diff --git a/indra/llmath/v3color.h b/indra/llmath/v3color.h index 60353bea6e..0b3b4ea3e1 100644 --- a/indra/llmath/v3color.h +++ b/indra/llmath/v3color.h @@ -485,7 +485,7 @@ inline const LLColor3 srgbColor3(const LLColor3 &a) { return srgbColor; } -inline const LLColor3 linearColor3(const F32* v) { +inline const LLColor3 linearColor3p(const F32* v) { LLColor3 linearColor; linearColor.mV[0] = sRGBtoLinear(v[0]); linearColor.mV[1] = sRGBtoLinear(v[1]); @@ -496,12 +496,12 @@ inline const LLColor3 linearColor3(const F32* v) { template inline const LLColor3 linearColor3(const T& a) { - return linearColor3(a.mV); + return linearColor3p(a.mV); } template inline const LLVector3 linearColor3v(const T& a) { - return LLVector3(linearColor3(a.mV).mV); + return LLVector3(linearColor3p(a.mV).mV); } #endif -- cgit v1.3