diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-01-21 17:45:26 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-01-21 17:45:26 +0200 |
| commit | af0e498293c86dc7bb1ae7911bf932b7b287e115 (patch) | |
| tree | 291a77c9a4eccc3cf177671507030b0758906192 /indra | |
| parent | 3527e9c0423f8a3c10c9d6e93805540315b285b6 (diff) | |
SL-10338 FIXED The “add friend” button is available when user is already at your friends list
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index eddc87efcd..4f42868f1a 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -29,6 +29,7 @@ #include "llchatitemscontainerctrl.h" #include "lltextbox.h" +#include "llavataractions.h" #include "llavatariconctrl.h" #include "llcommandhandler.h" #include "llfloaterreg.h" @@ -204,6 +205,7 @@ void LLFloaterIMNearbyChatToastPanel::init(LLSD& notification) mMsgText = getChild<LLChatMsgBox>("msg_text", false); mMsgText->setContentTrusted(false); + mMsgText->setIsFriendCallback(LLAvatarActions::isFriend); mMsgText->setText(std::string("")); diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 88b3fb7b96..a462f391ca 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -415,6 +415,7 @@ BOOL LLPanelLandGeneral::postBuild() mTextSalePending = getChild<LLTextBox>("SalePending"); mTextOwnerLabel = getChild<LLTextBox>("Owner:"); mTextOwner = getChild<LLTextBox>("OwnerText"); + mTextOwner->setIsFriendCallback(LLAvatarActions::isFriend); mContentRating = getChild<LLTextBox>("ContentRatingText"); mLandType = getChild<LLTextBox>("LandTypeText"); @@ -1191,6 +1192,7 @@ BOOL LLPanelLandObjects::postBuild() mIconGroup = LLUIImageList::getInstance()->getUIImage("icon_group.tga", 0); mOwnerList = getChild<LLNameListCtrl>("owner list"); + mOwnerList->setIsFriendCallback(LLAvatarActions::isFriend); mOwnerList->sortByColumnIndex(3, FALSE); childSetCommitCallback("owner list", onCommitList, this); mOwnerList->setDoubleClickCallback(onDoubleClickOwner, this); |