diff options
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/lllineeditor.cpp | 2 | ||||
-rw-r--r-- | indra/llui/lllineeditor.h | 2 | ||||
-rw-r--r-- | indra/llui/llui.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index bacfe67ad8..a41b2af2b4 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -2282,7 +2282,7 @@ LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory } //static -void LLLineEditor::cleanupClass() +void LLLineEditor::cleanupLineEditor() { sImage = NULL; } diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index c2dbedd3f5..98242a493d 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -82,7 +82,7 @@ public: virtual LLXMLNodePtr getXML(bool save_children = true) const; void setColorParameters(LLXMLNodePtr node); static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); - static void cleanupClass(); + static void cleanupLineEditor(); // mousehandler overrides /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 2b6895aa09..f34c48b729 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1575,7 +1575,7 @@ void LLUI::initClass(LLControlGroup* config, void LLUI::cleanupClass() { sImageProvider->cleanUp(); - LLLineEditor::cleanupClass(); + LLLineEditor::cleanupLineEditor(); } |