aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-04-12 02:21:04 -0700
committerMcCabe Maxsted2011-04-12 02:21:04 -0700
commit9a3f5a47f872288a373b0919b78ee042529e4327 (patch)
tree286467a704f656dc7a5d915383d6a6939f9aa9af
parentA little bit of cleanup for the inspect window (diff)
downloadmeta-impy-9a3f5a47f872288a373b0919b78ee042529e4327.zip
meta-impy-9a3f5a47f872288a373b0919b78ee042529e4327.tar.gz
meta-impy-9a3f5a47f872288a373b0919b78ee042529e4327.tar.bz2
meta-impy-9a3f5a47f872288a373b0919b78ee042529e4327.tar.xz
URLs are now clickable in group charters
-rw-r--r--linden/indra/newview/llpanelgroupgeneral.cpp7
1 files changed, 6 insertions, 1 deletions
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 @@
56#include "lltextbox.h" 56#include "lltextbox.h"
57#include "lltexteditor.h" 57#include "lltexteditor.h"
58#include "lltexturectrl.h" 58#include "lltexturectrl.h"
59#include "llviewercontrol.h"
59#include "llviewerwindow.h" 60#include "llviewerwindow.h"
60 61
61// consts 62// consts
@@ -813,7 +814,11 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
813 814
814 if (mEditCharter) 815 if (mEditCharter)
815 { 816 {
816 mEditCharter->setText(gdatap->mCharter); 817 mEditCharter->setParseHTML(TRUE);
818 mEditCharter->appendColoredText(gdatap->mCharter, false, false,
819 (mAllowEdit && can_change_ident) ?
820 gColors.getColor("TextFgColor") :
821 gColors.getColor("TextFgReadOnlyColor"));
817 mEditCharter->resetDirty(); 822 mEditCharter->resetDirty();
818 } 823 }
819 824