SL-19015 Balance sun/sky ambiance with punctual light ambiance. Prevent irradiance maps from being brighter than the environment.

1 files changed, 1 insertions, 17 deletions

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 42b7cc46b3..faa45d59b9 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -1041,26 +1041,10 @@ void LLGLSLShader::bind(bool rigged)
     }
 }
 
-void LLGLSLShader::unbind()
+void LLGLSLShader::unbind(void)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_SHADER;
     gGL.flush();
-    if (sCurBoundShaderPtr)
-    {
-        sCurBoundShaderPtr->readProfileQuery();
-    }
-    stop_glerror();
-    LLVertexBuffer::unbind();
-    glUseProgram(0);
-    sCurBoundShader = 0;
-    sCurBoundShaderPtr = NULL;
-    stop_glerror();
-}
-
-void LLGLSLShader::bindNoShader(void)
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_SHADER;
-
     LLVertexBuffer::unbind();
 
     if (sCurBoundShaderPtr)