diff options
author | Oz Linden <oz@lindenlab.com> | 2011-06-01 19:05:36 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-06-01 19:05:36 -0400 |
commit | 147567349ec0662300c2a7b80bf7729a2e064c4d (patch) | |
tree | 5f425dc94bc3976e5e7539e68216193de420b874 /indra/newview/lldrawpoolbump.cpp | |
parent | 2002a39e4db5ba96f4a0a7653f76a3cd55846a31 (diff) | |
parent | b100f1d2d43564cab5cebfbace66f14a9b7615df (diff) |
pull back fix for storm-1298 from beta branch
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
-rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 5f89d11391..2f76baaaf7 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -94,6 +94,13 @@ void LLStandardBumpmap::restoreGL() // static void LLStandardBumpmap::addstandard() { + if(!gTextureList.isInitialized()) + { + //Note: loading pre-configuration sometimes triggers this call. + //But it is safe to return here because bump images will be reloaded during initialization later. + return ; + } + // can't assert; we destroyGL and restoreGL a lot during *first* startup, which populates this list already, THEN we explicitly init the list as part of *normal* startup. Sigh. So clear the list every time before we (re-)add the standard bumpmaps. //llassert( LLStandardBumpmap::sStandardBumpmapCount == 0 ); clear(); @@ -891,6 +898,7 @@ void LLBumpImageList::restoreGL() { if(!gTextureList.isInitialized()) { + //safe to return here because bump images will be reloaded during initialization later. return ; } |