From c4d3682f07858a0ffada55e456357ff8192a7db1 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 21 May 2010 16:09:22 +0100 Subject: Avoid potentially loading the standard bumpmap list twice during startup. --- indra/newview/lldrawpoolbump.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 1fae8e518c..b7092f32a2 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 @@ -876,6 +876,8 @@ void LLBumpImageList::clear() // these will be re-populated on-demand mBrightnessEntries.clear(); mDarknessEntries.clear(); + + LLStandardBumpmap::clear(); } void LLBumpImageList::shutdown() @@ -892,8 +894,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