diff options
| author | McCabe Maxsted | 2011-04-12 02:38:01 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-04-12 02:38:01 -0700 |
| commit | 5b1c86fc09b73972c24941a6c1f62d8596055911 (patch) | |
| tree | d5dcfc784c570c34ef090530824f55c3fc9151c1 /linden | |
| parent | URLs are now clickable in group charters (diff) | |
| download | meta-impy-5b1c86fc09b73972c24941a6c1f62d8596055911.zip meta-impy-5b1c86fc09b73972c24941a6c1f62d8596055911.tar.gz meta-impy-5b1c86fc09b73972c24941a6c1f62d8596055911.tar.bz2 meta-impy-5b1c86fc09b73972c24941a6c1f62d8596055911.tar.xz | |
Made URLs clickable in the profile's Avatar and Real Life tabs
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llpanelavatar.cpp | 22 |
1 files changed, 19 insertions, 3 deletions
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**) | |||
| 1989 | { | 1989 | { |
| 1990 | image_ctrl->setImageAssetID(image_id); | 1990 | image_ctrl->setImageAssetID(image_id); |
| 1991 | } | 1991 | } |
| 1992 | self->childSetValue("about", about_text); | 1992 | LLTextEditor* about_field = self->mPanelSecondLife->getChild<LLTextEditor>("about"); |
| 1993 | if (about_field) | ||
| 1994 | { | ||
| 1995 | about_field->setParseHTML(TRUE); | ||
| 1996 | about_field->appendColoredText(about_text, false, false, | ||
| 1997 | (self->mAllowEdit && (self->mAvatarID == agent_id)) ? | ||
| 1998 | gColors.getColor("TextFgColor") : | ||
| 1999 | gColors.getColor("TextFgReadOnlyColor")); | ||
| 2000 | } | ||
| 1993 | 2001 | ||
| 1994 | self->mPanelSecondLife->setPartnerID(partner_id); | 2002 | self->mPanelSecondLife->setPartnerID(partner_id); |
| 1995 | self->mPanelSecondLife->updatePartnerName(); | 2003 | self->mPanelSecondLife->updatePartnerName(); |
| 1996 | 2004 | ||
| 1997 | if (self->mPanelFirstLife) | 2005 | if (self->mPanelFirstLife) |
| 1998 | { | 2006 | { |
| 1999 | // Teens don't get these | 2007 | about_field = self->mPanelFirstLife->getChild<LLTextEditor>("about"); |
| 2000 | self->mPanelFirstLife->childSetValue("about", fl_about_text); | 2008 | if (about_field) |
| 2009 | { | ||
| 2010 | about_field->setParseHTML(TRUE); | ||
| 2011 | about_field->appendColoredText(fl_about_text, false, false, | ||
| 2012 | (self->mAllowEdit && (self->mAvatarID == agent_id)) ? | ||
| 2013 | gColors.getColor("TextFgColor") : | ||
| 2014 | gColors.getColor("TextFgReadOnlyColor")); | ||
| 2015 | } | ||
| 2016 | |||
| 2001 | LLTextureCtrl* image_ctrl = self->mPanelFirstLife->getChild<LLTextureCtrl>("img"); | 2017 | LLTextureCtrl* image_ctrl = self->mPanelFirstLife->getChild<LLTextureCtrl>("img"); |
| 2002 | if(image_ctrl) | 2018 | if(image_ctrl) |
| 2003 | { | 2019 | { |