summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-10-12 18:49:18 -0500
committerDave Parks <davep@lindenlab.com>2022-10-12 18:49:18 -0500
commit598c953d540090caa8a9a12581a4ab8ae52615dd (patch)
tree403932e8219368a70a95ddf1b634cdbad551a6a9 /indra/llmath
parentbc84b88cb389f30bd9b6b1355a64abdad4185f35 (diff)
SL-18190 Fix for assert on 360 snapshot and ? fix for mac build ?
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/v3color.h6
1 files changed, 3 insertions, 3 deletions
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<class T>
inline const LLColor3 linearColor3(const T& a) {
- return linearColor3(a.mV);
+ return linearColor3p(a.mV);
}
template<class T>
inline const LLVector3 linearColor3v(const T& a) {
- return LLVector3(linearColor3(a.mV).mV);
+ return LLVector3(linearColor3p(a.mV).mV);
}
#endif