diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-05-13 12:01:34 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-05-13 12:01:34 -0700 |
| commit | 9ccf7557acbc59de128ea11012b02456134e17f5 (patch) | |
| tree | 761ae21285a60f2692ac13d94ebafa27b9bd80ce /indra/newview/lldrawpoolbump.cpp | |
| parent | 52f1830821859379a6dad8fb6d2cb140f7fe939e (diff) | |
| parent | 039b6baf065a87d747647fb0477c799a9949ebf2 (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 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. } |