diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-11-19 12:09:18 -0800 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-19 12:09:18 -0800 |
| commit | b6edd74775e07ce392b0a1785cfc61338c890dad (patch) | |
| tree | c01e3111d3016e5f6e5453f88d8e5aa30c7ced19 /indra/llui | |
| parent | 1139584b026db86fd20364d0eb21b6e2351f8fb1 (diff) | |
| parent | 8d21105a8c2b6bff98b4f3b91a614a4710d4b7ea (diff) | |
Merged latest lindenlab/viewer-development with mani_linden/viewer-development for bacground updater work.
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) |