diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-10 10:40:38 -0800 |
| commit | e040f16a4f2e50592a125a04185fd9f06ac49522 (patch) | |
| tree | 60a0e7fee37761a9278db6ab2b32f61fc38acbe1 /indra/llui | |
| parent | c320b2cef916cc8f0e42f041c29c04bf55d40d77 (diff) | |
| parent | 02701073ce70fc2e2043adf0ed7e0d6879669215 (diff) | |
merge
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) |