summaryrefslogtreecommitdiff
path: root/indra/llui/llui.cpp
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2010-11-27 13:08:00 +0000
committerTofu Buzzard <no-email>2010-11-27 13:08:00 +0000
commit31a109452d743af565f99029ec835e2f32261681 (patch)
tree07375d9174730e1deec3aedcc6333fe8426cd827 /indra/llui/llui.cpp
parentb3541777921142572f735c4b028e4fba91ae80a0 (diff)
parent2f83766bb71772eda19a4c7c61896c0fd7fae8a4 (diff)
merge
Diffstat (limited to 'indra/llui/llui.cpp')
-rw-r--r--indra/llui/llui.cpp5
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)