aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-05-15 17:59:45 -0700
committerJacek Antonelli2011-05-27 22:45:35 -0500
commitd24282c5f105404502fffd70b39d3d7e4c44bf5b (patch)
tree3a72fd7f83b6a4490aea2a7f4236c7275caee498
parentAuto-deRuth code, by way of Siana Gearz and the Phoenix viewer. (diff)
downloadmeta-impy-d24282c5f105404502fffd70b39d3d7e4c44bf5b.zip
meta-impy-d24282c5f105404502fffd70b39d3d7e4c44bf5b.tar.gz
meta-impy-d24282c5f105404502fffd70b39d3d7e4c44bf5b.tar.bz2
meta-impy-d24282c5f105404502fffd70b39d3d7e4c44bf5b.tar.xz
Made LLTextEditor::clear() actually clear the contents of the textbox rather than just replace unstyled text
-rw-r--r--linden/indra/llui/lltexteditor.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index dd72a69..79966c2 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -3869,6 +3869,12 @@ void LLTextEditor::onTabInto()
3869// virtual 3869// virtual
3870void LLTextEditor::clear() 3870void LLTextEditor::clear()
3871{ 3871{
3872 // Also clear any styling we might have added -- MC
3873 mParseHTML = FALSE;
3874 mParseHighlights = FALSE;
3875
3876 mSegments.clear();
3877
3872 setText(LLStringUtil::null); 3878 setText(LLStringUtil::null);
3873 std::for_each(mSegments.begin(), mSegments.end(), DeletePointer()); 3879 std::for_each(mSegments.begin(), mSegments.end(), DeletePointer());
3874 mSegments.clear(); 3880 mSegments.clear();