diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2024-06-11 23:18:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-11 23:18:54 -0700 |
| commit | 0f3c3563b0861e8ea82b201aab8343d99f993bbc (patch) | |
| tree | 7ab124cd4852f2d36bf897090feff5cf29c3ebc7 /indra/llrender/llglslshader.cpp | |
| parent | 6a00609b0cede78f998971687a756b7fcf826c0f (diff) | |
| parent | ed34782283aa2ae6a7a76c0492a2f9edc6bb3629 (diff) | |
Merge pull request #1726 from secondlife/roxie/webrtc-voice
Merge from main.
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 97759939c9..28b5bc7495 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -1190,6 +1190,8 @@ S32 LLGLSLShader::enableTexture(S32 uniform, LLTexUnit::eTextureType mode, LLTex LL_SHADER_UNIFORM_ERRS() << "Uniform out of range: " << uniform << LL_ENDL; return -1; } + + S32 index = mTexture[uniform]; if (index != -1) { |