From a16a20ccf5b2adbc8c7d09b34c8ce9936f23d615 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Sat, 13 Feb 2021 11:01:06 -0600
Subject: [PATCH] More macOS compile fixes, from Kitty and Zi.

---
 indra/newview/llvisualeffect.h | 6 ++++--
 indra/newview/rlveffects.cpp   | 2 ++
 indra/newview/rlvhelper.cpp    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llvisualeffect.h b/indra/newview/llvisualeffect.h
index 8baa5e8091..cde38a12f2 100644
--- a/indra/newview/llvisualeffect.h
+++ b/indra/newview/llvisualeffect.h
@@ -17,6 +17,8 @@
 #pragma once
 
 #include "llsingleton.h"
+#include <boost/optional.hpp>
+#include <boost/none.hpp>
 
 // ============================================================================
 // 
@@ -112,12 +114,12 @@ template<typename T>
 class LLTweenableValueLerp : public LLTweenableValue<T>
 {
 public:
-	LLTweenableValueLerp(const T& defaultValue) : LLTweenableValue(defaultValue) {}
+	LLTweenableValueLerp(const T& defaultValue) : LLTweenableValue<T>(defaultValue) {}
 	T    get() override;
 	void start(const T& endValue, double duration) override
 	{
 		m_StartValue = get();
-		m_CurValue = boost::none;
+		this->m_CurValue = boost::none;
 		m_EndValue = endValue;
 
 		m_StartTime = LLTimer::getElapsedSeconds();
diff --git a/indra/newview/rlveffects.cpp b/indra/newview/rlveffects.cpp
index 9ed13747ba..6da6a15825 100644
--- a/indra/newview/rlveffects.cpp
+++ b/indra/newview/rlveffects.cpp
@@ -433,6 +433,8 @@ void RlvSphereEffect::run(const LLVisualEffectParams* pParams)
 			gRlvSphereProgram.uniform2f(LLShaderMgr::RLV_EFFECT_PARAM5, 0.f, 1.f);
 			renderPass(&gRlvSphereProgram, pShaderParams);
 			break;
+		default:
+			llassert(true);
 	}
 
 	gRlvSphereProgram.unbind();
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 31ab29e7a8..899e5df01d 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -416,7 +416,7 @@ const RlvBehaviourInfo* RlvBehaviourDictionary::getBehaviourInfo(ERlvBehaviour e
 {
 	const RlvBehaviourInfo* pBhvrInfo = nullptr;
 	for (auto itBhvrLower = m_Bhvr2InfoMap.lower_bound(eBhvr), itBhvrUpper = m_Bhvr2InfoMap.upper_bound(eBhvr);
-		 std::find_if(itBhvrLower, itBhvrUpper, [eBhvr, eParamType](const rlv_bhvr2info_map_t::value_type& bhvrEntry) { return bhvrEntry.second->getParamTypeMask() == eParamType; }) != itBhvrUpper;
+		 std::find_if(itBhvrLower, itBhvrUpper, [eParamType](const rlv_bhvr2info_map_t::value_type& bhvrEntry) { return bhvrEntry.second->getParamTypeMask() == eParamType; }) != itBhvrUpper;
 		++itBhvrLower)
 	{
 		if (pBhvrInfo)