From 3008d5790d77af740847f1b39dedc117574cce60 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Fri, 21 May 2010 16:09:22 +0100
Subject: Avoid potentially loading the standard bumpmap list twice during
 startup. (transplanted from 6dfc8d6ec39f6f3af4495c27546054f311b884af)

---
 indra/newview/lldrawpoolbump.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index 3c26809259..eefb93dc0c 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -82,7 +82,7 @@ static S32 bump_channel = -1;
 // static 
 void LLStandardBumpmap::init()
 {
-	LLStandardBumpmap::restoreGL();
+	// do nothing
 }
 
 // static 
@@ -835,6 +835,8 @@ void LLBumpImageList::clear()
 	// these will be re-populated on-demand
 	mBrightnessEntries.clear();
 	mDarknessEntries.clear();
+
+	LLStandardBumpmap::clear();
 }
 
 void LLBumpImageList::shutdown()
@@ -851,8 +853,8 @@ void LLBumpImageList::destroyGL()
 
 void LLBumpImageList::restoreGL()
 {
-	// Images will be recreated as they are needed.
 	LLStandardBumpmap::restoreGL();
+	// Images will be recreated as they are needed.
 }
 
 
-- 
cgit v1.2.3