livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More macOS compile fixes, from Kitty and Zi.

meow-7.2.2
Tonya Souther 2021-02-13 11:01:06 -06:00
parent cc0cc20e8b
commit a16a20ccf5
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llvisualeffect.h
View File

@ -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();

2
indra/newview/rlveffects.cpp
View File

@ -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();

2
indra/newview/rlvhelper.cpp
View File

@ -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)