diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 18:29:17 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 18:29:17 -0400 |
| commit | 3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (patch) | |
| tree | 7cd7cef085a002885a362337fc8b67060bfcc395 /indra/llui/llui.cpp | |
| parent | 31d3d654f156351e3cf29f97fd97cbda046ae650 (diff) | |
| parent | 959edebeca3c1d9f0730292c2f3bc0e8bb5bf94a (diff) | |
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index aabc7ed2e4..cc186f4997 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -60,6 +60,7 @@ #include "llflyoutbutton.h" #include "llsearcheditor.h" #include "lltoolbar.h" +#include "llcleanup.h" // for XUIParse #include "llquaternion.h" @@ -208,7 +209,7 @@ void LLUI::initClass(const settings_map_t& settings, void LLUI::cleanupClass() { - LLRender2D::cleanupClass(); + SUBSYSTEM_CLEANUP(LLRender2D); } void LLUI::setPopupFuncs(const add_popup_t& add_popup, const remove_popup_t& remove_popup, const clear_popups_t& clear_popups) |