From 40cb75a431caa5a5c11077faaf057293e9ccf138 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 6 Apr 2021 23:13:16 -0400
Subject: [PATCH] Fix some gcc warnings
---
indra/newview/lldrawpoolavatar.cpp | 1 -
indra/newview/llmeshrepository.cpp | 2 +-
indra/newview/llvisualeffect.h | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 2cfcac652ca..5c8289b584e 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -53,7 +53,6 @@
#include "llviewercontrol.h" // for gSavedSettings
#include "llviewertexturelist.h"
-static U32 sDataMask = LLDrawPoolAvatar::VERTEX_DATA_MASK;
static U32 sBufferUsage = GL_STREAM_DRAW;
static U32 sShaderLevel = 0;
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 3b09240d321..f19fbe11ece 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -874,7 +874,7 @@ LLMeshRepoThread::~LLMeshRepoThread()
void LLMeshRepoThread::run()
{
- LLCDResult res = LLConvexDecomposition::initThread();
+ /*LLCDResult res = */LLConvexDecomposition::initThread();
//if (res != LLCD_OK && LLConvexDecomposition::isFunctional())
//{
// LL_WARNS(LOG_MESH) << "Convex decomposition unable to be loaded. Expect severe problems." << LL_ENDL;
diff --git a/indra/newview/llvisualeffect.h b/indra/newview/llvisualeffect.h
index 8477f6d5d0c..6d2a7624d6a 100644
--- a/indra/newview/llvisualeffect.h
+++ b/indra/newview/llvisualeffect.h
@@ -46,6 +46,7 @@ enum class EVisualEffectType
struct LLVisualEffectParams
{
+ virtual ~LLVisualEffectParams() = default;
virtual void step(bool isLast) = 0;
};
--
GitLab