From 7ce17542d46ff7cb6b88d33d4cad5ba4808c6c58 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 12 Nov 2021 17:34:13 +0200
Subject: DRTVWR-528 Reverting multiple commits due to moving them into D546
 branch

This reverts commits
9b5b2eac82b1f423daec463b3d55d0f3d3979bbc  SL-15933
53c0144dd272470172591b967a84beaa4019b728  SL-11687
492ea7c3a03d5ef0d3679b873a44c08baaced0f1 SL-16056
b854eceee3a867d64b20de18d6b7ce91b33abed0 SL-15391
921c3f5f69c90b5924d2f4bbbd32455f8c9c8173 SL-13561
639acb6ff7495a6840d437dd8473172ec03e200a SL-15333
---
 indra/llrender/llglslshader.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'indra/llrender/llglslshader.cpp')

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index d3942c7552..42b8c35442 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -1427,11 +1427,7 @@ GLint LLGLSLShader::getUniformLocation(U32 index)
     GLint ret = -1;
     if (mProgramObject)
     {
-        if (index >= mUniform.size())
-        {
-            LL_WARNS_ONCE("Shader") << "Uniform index " << index << " out of bounds " << (S32)mUniform.size() << LL_ENDL;
-            return ret;
-        }
+        llassert(index < mUniform.size());
         return mUniform[index];
     }
 
-- 
cgit v1.2.3