Ugly workaround for LLStyle issue when parsing textboxes for html while editing them.

This might be fixed in Viewer 2? If not, sadness. Also, added html parsing for picks and classified ads while I was there

1 files changed, 9 insertions, 5 deletions

diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 9aa70f7..8e61c60 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -814,11 +814,15 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 
         if (mEditCharter)
         {
-                mEditCharter->setParseHTML(TRUE);
-                mEditCharter->appendColoredText(gdatap->mCharter, false, false, 
-                                                                                                                                                (mAllowEdit && can_change_ident) ? 
-                                                                                                                                                gColors.getColor("TextFgColor") :
-                                                                                                                                                gColors.getColor("TextFgReadOnlyColor"));
+                if (mAllowEdit && can_change_ident)
+                {
+                        mEditCharter->setText(gdatap->mCharter);
+                }
+                else
+                {
+                        mEditCharter->setParseHTML(TRUE);
+                        mEditCharter->appendColoredText(gdatap->mCharter, false, false, gColors.getColor("TextFgReadOnlyColor"));
+                }
                 mEditCharter->resetDirty();
         }