diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-05-12 13:42:51 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-05-12 13:42:51 -0700 |
| commit | 00c5628074dff2a687d737bc30e9dbe2a1ccfbf8 (patch) | |
| tree | ad6819435b956dee23c6463d69fe26caa89d912d /indra/newview/lldrawpoolbump.cpp | |
| parent | 11f988cd09daa8f33a21b7f82201e4b59e8a04ad (diff) | |
| parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
Merge lindenlab/viewer-development
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. } |