diff options
| author | Richard Linden <none@none> | 2011-05-12 13:20:09 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-12 13:20:09 -0700 |
| commit | 4e02747908a00a2e6103e7a923e522aed0e22ada (patch) | |
| tree | 94ad4f0ffd6a2e4559c267661d8ac36c70aefb86 /indra/newview/lldrawpoolbump.cpp | |
| parent | 506646b4d0619ed66cf0df481112300bc47c0ab8 (diff) | |
| parent | e18f200243b5d9e5adba244634ecdaa4ac7da8dc (diff) | |
Automated merge with bundle:F:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.7nrmxq\ssh__richard@hg.lindenlab.com_richard_viewer-experience_gittck.hg
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 223e4a438c..c987847c66 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -853,6 +853,11 @@ void LLBumpImageList::destroyGL() void LLBumpImageList::restoreGL() { + if(!gTextureList.isInitialized())
+ {
+ return ;
+ } + LLStandardBumpmap::restoreGL(); // Images will be recreated as they are needed. } |