From f2867c71dba95b21771dc1f6edacaed6755ab6da Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Thu, 29 Sep 2022 13:58:05 -0700
Subject: Better fix for DRTVWR-559 mac build breakage

---
 indra/llmath/v3color.h | 6 ++++++
 indra/llmath/v3math.h  | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/indra/llmath/v3color.h b/indra/llmath/v3color.h
index 7d825b2b94..60353bea6e 100644
--- a/indra/llmath/v3color.h
+++ b/indra/llmath/v3color.h
@@ -33,6 +33,7 @@ class LLVector4;
 #include "llerror.h"
 #include "llmath.h"
 #include "llsd.h"
+#include "v3math.h"  // needed for linearColor3v implemtation below
 #include <string.h>
 
 //  LLColor3 = |r g b|
@@ -498,4 +499,9 @@ inline const LLColor3 linearColor3(const T& a) {
     return linearColor3(a.mV);
 }
 
+template<class T>
+inline const LLVector3 linearColor3v(const T& a) {
+    return LLVector3(linearColor3(a.mV).mV);
+}
+
 #endif
diff --git a/indra/llmath/v3math.h b/indra/llmath/v3math.h
index 48c5c21863..068f489020 100644
--- a/indra/llmath/v3math.h
+++ b/indra/llmath/v3math.h
@@ -609,9 +609,4 @@ inline std::ostream& operator<<(std::ostream& s, const LLVector3 &a)
 	return s;
 }
 
-template<class T>
-inline const LLVector3 linearColor3v(const T& a) {
-    return LLVector3(linearColor3(a.mV).mV);
-}
-
 #endif
-- 
cgit v1.2.3