From 4f0c170a244d5c88c7ceda58b0b9dd65fbe48fce Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 13 Feb 2021 19:16:42 +0100
Subject: [PATCH] GCC and Clang warnings and error
---
indra/newview/llvisualeffect.h | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/indra/newview/llvisualeffect.h b/indra/newview/llvisualeffect.h
index ef346bde750..69387d49af8 100644
--- a/indra/newview/llvisualeffect.h
+++ b/indra/newview/llvisualeffect.h
@@ -98,12 +98,6 @@ class LLVisualEffect
//
//
-enum class LLTweenType
-{
- None,
- Lerp,
-};
-
template<typename T>
class LLTweenableValue
{
@@ -127,13 +121,13 @@ 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();
--
GitLab