1 files changed, 8 insertions, 4 deletions

diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 28859b1..8612427 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -389,14 +389,12 @@ LLTextEditor::LLTextEditor(
         LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_rightclick_text.xml",this);
         if (!menu)
         {
-                  menu = new LLMenuGL(LLStringUtil::null);
+                menu = new LLMenuGL(LLStringUtil::null);
         }
 
         defineMenuCallbacks(menu);
         mPopupMenuHandle = menu->getHandle();
-        menu->setBorderColor(gColors.getColor("MenuItemDisabledColor"));
         menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
-
 }
 
 LLTextEditor::~LLTextEditor()
@@ -636,7 +634,7 @@ void LLTextEditor::defineMenuCallbacks(LLMenuGL* menu) {
                               "Select All Text",
                               this,
                               (void*)context_enable_selectall);
-        menu->setCtrlResponse(1+LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
                               "Select All Text",
                               this,
                               (void*)context_selectall);
@@ -3869,6 +3867,12 @@ void LLTextEditor::onTabInto()
 // virtual
 void LLTextEditor::clear()
 {
+        // Also clear any styling we might have added -- MC
+        mParseHTML = FALSE;
+        mParseHighlights = FALSE;
+
+        mSegments.clear();
+
         setText(LLStringUtil::null);
         std::for_each(mSegments.begin(), mSegments.end(), DeletePointer());
         mSegments.clear();