diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 15:36:11 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 15:36:11 -0800 |
| commit | 6802775bc4952874e26f320e1ec7ce9f7ed2e2fb (patch) | |
| tree | fb5b9b355214fe5ab949ff62ad5146d49557c2e0 /indra/llui/llui.cpp | |
| parent | 327a922dc9cda771077826ecf7521464ebd281c0 (diff) | |
| parent | 0e52564f0a36365c2ce5f5263d15778394741fde (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/llui/llui.cpp')
| -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) |