diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-13 10:29:52 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-13 10:29:52 -0400 |
commit | 4046e0801ba4f7a01311de06b110177630ea6e04 (patch) | |
tree | 47ad154496cb50ef39617cf1b9ddc147d1358076 /indra/newview/lldrawpoolbump.cpp | |
parent | 40325a7347a059f913e01b449c924b13d1471e23 (diff) | |
parent | 8017900e7f536663153451ff788d8662427782ed (diff) |
merge
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 3f5cb4778e..29b50761d8 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -889,6 +889,11 @@ void LLBumpImageList::destroyGL() void LLBumpImageList::restoreGL() { + if(!gTextureList.isInitialized())
+ {
+ return ;
+ } + LLStandardBumpmap::restoreGL(); // Images will be recreated as they are needed. } |