summaryrefslogtreecommitdiff
path: root/indra/newview/llskinningutil.cpp
diff options
context:
space:
mode:
authorCallum Linden <callum@lindenlab.com>2022-08-29 10:14:06 -0700
committerCallum Linden <callum@lindenlab.com>2022-08-29 10:14:06 -0700
commita3f7f7d8c08e19d338911e107707f756469716bc (patch)
treec86773c81cbcb03300132eb684134b878aeca357 /indra/newview/llskinningutil.cpp
parent35de5fc912c908fb1c3c5257f28e72ffebe796c4 (diff)
parent592abc460c96b63b1b1e0d15914f7b64a0c88038 (diff)
Merge remote-tracking branch 'origin/more-c++17' into DRTVWR-568
Diffstat (limited to 'indra/newview/llskinningutil.cpp')
-rw-r--r--indra/newview/llskinningutil.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp
index cf3519c1c7..8bdccfd9f6 100644
--- a/indra/newview/llskinningutil.cpp
+++ b/indra/newview/llskinningutil.cpp
@@ -264,6 +264,9 @@ void LLSkinningUtil::getPerVertexSkinMatrix(
// SL-366 - with weight validation/cleanup code, it should no longer be
// possible to hit the bad scale case.
llassert(valid_weights);
+ // When building for Release, the above llassert() goes away. Ward off
+ // variable-set-but-unused error.
+ (void)valid_weights;
}
void LLSkinningUtil::initJointNums(LLMeshSkinInfo* skin, LLVOAvatar *avatar)