From 5b1c86fc09b73972c24941a6c1f62d8596055911 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 12 Apr 2011 02:38:01 -0700 Subject: Made URLs clickable in the profile's Avatar and Real Life tabs --- linden/indra/newview/llpanelavatar.cpp | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp index d924009..612d9a5 100644 --- a/linden/indra/newview/llpanelavatar.cpp +++ b/linden/indra/newview/llpanelavatar.cpp @@ -1989,15 +1989,31 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) { image_ctrl->setImageAssetID(image_id); } - self->childSetValue("about", about_text); + LLTextEditor* about_field = self->mPanelSecondLife->getChild("about"); + if (about_field) + { + about_field->setParseHTML(TRUE); + about_field->appendColoredText(about_text, false, false, + (self->mAllowEdit && (self->mAvatarID == agent_id)) ? + gColors.getColor("TextFgColor") : + gColors.getColor("TextFgReadOnlyColor")); + } self->mPanelSecondLife->setPartnerID(partner_id); self->mPanelSecondLife->updatePartnerName(); if (self->mPanelFirstLife) { - // Teens don't get these - self->mPanelFirstLife->childSetValue("about", fl_about_text); + about_field = self->mPanelFirstLife->getChild("about"); + if (about_field) + { + about_field->setParseHTML(TRUE); + about_field->appendColoredText(fl_about_text, false, false, + (self->mAllowEdit && (self->mAvatarID == agent_id)) ? + gColors.getColor("TextFgColor") : + gColors.getColor("TextFgReadOnlyColor")); + } + LLTextureCtrl* image_ctrl = self->mPanelFirstLife->getChild("img"); if(image_ctrl) { -- cgit v1.1