From 9a3f5a47f872288a373b0919b78ee042529e4327 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 12 Apr 2011 02:21:04 -0700
Subject: URLs are now clickable in group charters

---
 linden/indra/newview/llpanelgroupgeneral.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 7ff25a7..9aa70f7 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -56,6 +56,7 @@
 #include "lltextbox.h"
 #include "lltexteditor.h"
 #include "lltexturectrl.h"
+#include "llviewercontrol.h"
 #include "llviewerwindow.h"
 
 // consts
@@ -813,7 +814,11 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 
 	if (mEditCharter)
 	{
-		mEditCharter->setText(gdatap->mCharter);
+		mEditCharter->setParseHTML(TRUE);
+		mEditCharter->appendColoredText(gdatap->mCharter, false, false, 
+																		(mAllowEdit && can_change_ident) ? 
+																		gColors.getColor("TextFgColor") :
+																		gColors.getColor("TextFgReadOnlyColor"));
 		mEditCharter->resetDirty();
 	}
 	
-- 
cgit v1.1