From 2e0a9ac0ca5dea4c966bcde9369c3d582937308a Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 27 Jul 2020 05:39:01 -0400
Subject: [PATCH] Fix a few warnings
---
indra/llcommon/llfindlocale.cpp | 2 +-
indra/newview/lldrawpooltree.cpp | 2 +-
indra/newview/lldrawpoolwater.cpp | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/indra/llcommon/llfindlocale.cpp b/indra/llcommon/llfindlocale.cpp
index f019bd0c647..3d6aaf70fe5 100644
--- a/indra/llcommon/llfindlocale.cpp
+++ b/indra/llcommon/llfindlocale.cpp
@@ -177,7 +177,7 @@ canonise_fl(FL_Locale *l) {
#define RML(pn,sn) MAKELANGID(LANG_##pn, SUBLANG_##sn)
struct IDToCode {
LANGID id;
- char* code;
+ const char* code;
};
static const IDToCode both_to_code[] = {
{ML(ENGLISH,US), "en_US.ISO_8859-1"},
diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp
index e40c98ca121..a7ba1e24a7a 100644
--- a/indra/newview/lldrawpooltree.cpp
+++ b/indra/newview/lldrawpooltree.cpp
@@ -99,7 +99,7 @@ void LLDrawPoolTree::render(S32 pass)
LLGLState test(GL_ALPHA_TEST, LLGLSLShader::sNoFixedFunction ? 0 : 1);
// [SL:KB] - Patch: Render-TextureToggle (Catznip-4.0)
- LLViewerTexture* pTexture = (LLPipeline::sRenderTextures) ? mTexturep : LLViewerFetchedTexture::sDefaultDiffuseImagep;
+ LLViewerTexture* pTexture = (LLPipeline::sRenderTextures) ? static_cast<LLViewerTexture*>(mTexturep) : static_cast<LLViewerTexture*>(LLViewerFetchedTexture::sDefaultDiffuseImagep);
gGL.getTexUnit(sDiffTex)->bind(pTexture);
// [/SL:KB]
// gGL.getTexUnit(sDiffTex)->bind(mTexturep);
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index 37ac88369c1..351adf36688 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -639,7 +639,8 @@ void LLDrawPoolWater::shade2(bool edge, LLGLSLShader* shader, const LLColor3& li
}
else
{
- LLGLSquashToFarClip far_clip(get_current_projection());
+ auto proj = get_current_projection();
+ LLGLSquashToFarClip far_clip(proj);
face->renderIndexed();
}
}
--
GitLab