diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-11-19 15:40:05 -0800 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-19 15:40:05 -0800 |
| commit | fd78866bcdf712aaefecfb74d7edaecb30c91b27 (patch) | |
| tree | 235398d36401c68fc841389bb11984d94d36d7db /indra/llui | |
| parent | 3337ef16cee97e26b45aa07518d34d031bdc75fa (diff) | |
| parent | b6edd74775e07ce392b0a1785cfc61338c890dad (diff) | |
Merged latest lindenlab/viewer-development with mani_linden/viewer-development
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llui.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index ff9af21e54..19c42bf61a 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1620,7 +1620,10 @@ void LLUI::initClass(const settings_map_t& settings, void LLUI::cleanupClass() { - sImageProvider->cleanUp(); + if(sImageProvider) + { + sImageProvider->cleanUp(); + } } void LLUI::setPopupFuncs(const add_popup_t& add_popup, const remove_popup_t& remove_popup, const clear_popups_t& clear_popups) |