From 919558cb27a184fb6254c6a51aed794820b3f58b Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 12 Mar 2023 21:09:35 -0400
Subject: [PATCH] fix warnings
---
indra/llimage/llimage.cpp | 2 +-
indra/llimage/llimagefilter.cpp | 2 +-
indra/newview/llface.cpp | 1 +
indra/newview/llfloaterworldmap.cpp | 2 +-
indra/newview/viewer_manifest.py | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 3bbea891a7f..603390a22d1 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -1114,7 +1114,7 @@ void LLImageRaw::compositeScaled4onto3(LLImageRaw* src)
llassert( (4 == src->getComponents()) && (3 == dst->getComponents()) );
S32 temp_data_size = src->getWidth() * dst->getHeight() * src->getComponents();
- llassert_always(temp_data_size > 0);
+ llassert(temp_data_size > 0);
std::vector<U8> temp_buffer(temp_data_size);
// Vertical: scale but no composite
diff --git a/indra/llimage/llimagefilter.cpp b/indra/llimage/llimagefilter.cpp
index a804f3e28a5..30c03d24f01 100644
--- a/indra/llimage/llimagefilter.cpp
+++ b/indra/llimage/llimagefilter.cpp
@@ -386,7 +386,7 @@ void LLImageFilter::convolve(const LLMatrix3 &kernel, bool normalize, bool abs_v
U8* dst_data = mImage->getData();
S32 buffer_size = width * components;
- llassert_always(buffer_size > 0);
+ llassert(buffer_size > 0);
std::vector<U8> even_buffer(buffer_size);
std::vector<U8> odd_buffer(buffer_size);
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 3f026cd8378..15ac33b4d42 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1462,6 +1462,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
}
const LLMeshSkinInfo* skin = nullptr;
LLMatrix4a mat_vert;
+ mat_vert.setIdentity();
LLMatrix4a mat_normal;
// prepare mat_vert
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 63a6c22293e..b04341cbf48 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -487,7 +487,7 @@ void LLFloaterWorldMap::draw()
bool agent_on_prelude = (regionp && regionp->isPrelude());
bool enable_go_home = gAgent.isGodlike() || !agent_on_prelude;
// [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
- mGoHomeButton->setEnabled(enable_go_home && (!rlv_handler_t::isEnabled()) || !(gRlvHandler.hasBehaviour(RLV_BHVR_TPLM) && gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC)));
+ mGoHomeButton->setEnabled(enable_go_home && ((!rlv_handler_t::isEnabled()) || !(gRlvHandler.hasBehaviour(RLV_BHVR_TPLM) && gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC))));
// [/RLVa:KB]
updateLocation();
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e8baa5f0953..9f3aae2ee80 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1161,7 +1161,7 @@ def strip_binaries(self):
["find"] +
[os.path.join(self.get_dst_prefix(), dir) for dir in ('bin', 'lib')] +
['-type', 'f', '!', '-name', '*.py', '!', '-name', '*.pak', '!', '-name', '*.bin', '!', '-name', '*.dat',
- '!', '-name', 'update_install', '!', '-name', '*.exe', '!', '-name', '*.dll', '!', '-name', '*.pdb', '!', '-name', '*.json',
+ '!', '-name', 'update_install', '!', '-name', '*.exe', '!', '-name', '*.dll', '!', '-name', '*.lib', '!', '-name', '*.pdb', '!', '-name', '*.json',
'-exec', 'strip', '-S', '{}', ';'])
class Linux_i686_Manifest(LinuxManifest):
--
GitLab