livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LP: Do not parse links in own profile

Kadah_Coba 2012-02-18 16:25:08 -08:00
parent 3d13274513
commit 3fa7346151
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/lltextbase.h
View File

@ -340,6 +340,10 @@ public:
/*virtual*/ bool useSpellCheck() const;
// [/SL:KB]
//<FS:KC - expose ParseHTML setting>
void setParseHTML(bool parse_html) { mParseHTML = parse_html; }
//</FS:KC - expose ParseHTML setting>
// used by LLTextSegment layout code
bool getWordWrap() { return mWordWrap; }
bool getUseEllipses() { return mUseEllipses; }

5
indra/newview/fspanelprofile.cpp
View File

@ -263,7 +263,6 @@ BOOL FSPanelProfile::postBuild()
childSetCommitCallback("add_friend", boost::bind(&FSPanelProfile::onAddFriendButtonClick, this),NULL);
childSetCommitCallback("im", boost::bind(&FSPanelProfile::onIMButtonClick, this), NULL);
childSetCommitCallback("call", boost::bind(&FSPanelProfile::onCallButtonClick, this), NULL);
childSetCommitCallback("teleport", boost::bind(&FSPanelProfile::onTeleportButtonClick, this), NULL);
childSetCommitCallback("show_on_map_btn", boost::bind(&FSPanelProfile::onMapButtonClick, this), NULL);
childSetCommitCallback("pay", boost::bind(&FSPanelProfile::pay, this), NULL);
@ -307,11 +306,15 @@ void FSPanelProfile::onOpen(const LLSD& key)
LLGroupList* group_list = getChild<LLGroupList>("group_list");
group_list->enableForAgent();
getChild<LLTextBase>("sl_description_edit")->setParseHTML(false);
}
else
{
//Disable "Add Friend" button for friends.
getChildView("add_friend")->setEnabled(!LLAvatarActions::isFriend(getAvatarId()));
mVoiceStatus == LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking();
}
FSDropTarget* target = getChild<FSDropTarget> ("drop_target");