EXT-7479 FIXED only bumpmaps of type Brightness or Darkness load on 2.0.2 (205107)

(transplanted from 372fb87d85f7d78c6ff285b4789bd868cb000c97)

2 files changed, 4 insertions, 5 deletions

diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index b7092f32a2..711034a972 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -82,7 +82,7 @@ static S32 bump_channel = -1;
 // static 
 void LLStandardBumpmap::init()
 {
-	// do nothing
+	LLStandardBumpmap::restoreGL();
 }
 
 // static 
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 481c96dae3..623950853e 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -119,10 +119,9 @@ static bool handleTerrainDetailChanged(const LLSD& newvalue)
 
 static bool handleSetShaderChanged(const LLSD& newvalue)
 {
-	// changing shader level may invalidate existing cached bump maps, as the shader type determines the format of the bump map it expects - clear the bump cache
-	gBumpImageList.clear();
-	LLStandardBumpmap::clear();
-	LLStandardBumpmap::addstandard();
+	// changing shader level may invalidate existing cached bump maps, as the shader type determines the format of the bump map it expects - clear and repopulate the bump cache
+	gBumpImageList.destroyGL();
+	gBumpImageList.restoreGL();
 
 	LLViewerShaderMgr::instance()->setShaders();
 	return true;