diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-16 15:48:56 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-16 15:48:56 +0800 |
| commit | 9f6d46604f628767f3ac701671d5678594852156 (patch) | |
| tree | 13f93c23b7795344d3fcc3a9ea0f8fce4b86ffd7 /indra/newview | |
| parent | a8308c46de81023d56a9e4b152290719a2d9c900 (diff) | |
| parent | 10ef293bc93230437d8aa3b17fcc1bfdc78f6ba8 (diff) | |
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer.git into webrtc-voice
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 9aee1c0caf..03dca1e5f3 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -834,7 +834,7 @@ S32 LLViewerTexture::getTotalNumFaces() const S32 LLViewerTexture::getNumFaces(U32 ch) const { llassert(ch < LLRender::NUM_TEXTURE_CHANNELS); - return mNumFaces[ch]; + return ch < LLRender::NUM_TEXTURE_CHANNELS ? mNumFaces[ch] : 0; } |