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

Add Remove Friend button to profiles to swap with Add Friend

meow-7.2.2
Zi Ree 2022-09-25 00:25:31 +02:00
parent deb05f7a7e
commit 6cc91f43b1
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llpanelprofile.cpp
View File

@ -954,6 +954,7 @@ BOOL LLPanelProfileSecondLife::postBuild()
mBlockButton = getChild<LLButton>("block");
mUnblockButton = getChild<LLButton>("unblock");
mAddFriendButton = getChild<LLButton>("add_friend");
mRemoveFriendButton = getChild<LLButton>("remove_friend"); // <FS:Zi> Add "Remove Friend" button to profile
mPayButton = getChild<LLButton>("pay");
mIMButton = getChild<LLButton>("im");
mOverflowButton = getChild<LLMenuButton>("overflow_btn");
@ -969,6 +970,7 @@ BOOL LLPanelProfileSecondLife::postBuild()
mBlockButton->setCommitCallback([this](LLUICtrl*, void*) { onCommitMenu(LLSD("toggle_block_agent")); }, nullptr);
mUnblockButton->setCommitCallback([this](LLUICtrl*, void*) { onCommitMenu(LLSD("toggle_block_agent")); }, nullptr);
mAddFriendButton->setCommitCallback([this](LLUICtrl*, void*) { onCommitMenu(LLSD("add_friend")); }, nullptr);
mRemoveFriendButton->setCommitCallback([this](LLUICtrl*, void*) { onCommitMenu(LLSD("remove_friend")); }, nullptr); // <FS:Zi> Add "Remove Friend" button to profile
mPayButton->setCommitCallback([this](LLUICtrl*, void*) { onCommitMenu(LLSD("pay")); }, nullptr);
mIMButton->setCommitCallback([this](LLUICtrl*, void*) { onCommitMenu(LLSD("im")); }, nullptr);
// </FS:Ansariel>
@ -1167,6 +1169,7 @@ void LLPanelProfileSecondLife::resetData()
mTeleportButton->setVisible(!own_profile);
mIMButton->setVisible(!own_profile);
mAddFriendButton->setVisible(!own_profile);
mRemoveFriendButton->setVisible(!own_profile); // <FS:Zi> Add "Remove Friend" button to profile
mBlockButton->setVisible(!own_profile);
mUnblockButton->setVisible(!own_profile);
mGroupList->setShowNone(!own_profile);
@ -1713,7 +1716,11 @@ void LLPanelProfileSecondLife::updateButtons()
mTeleportButton->setEnabled(is_buddy_online && can_offer_tp);
// </FS:Ansariel>
//Disable "Add Friend" button for friends.
mAddFriendButton->setEnabled(false);
// <FS:Zi> Add "Remove Friend" button to profile
// mAddFriendButton->setEnabled(false);
mAddFriendButton->setVisible(false);
mRemoveFriendButton->setVisible(true);
// </FS:Zi>
}
else
{
@ -1723,7 +1730,11 @@ void LLPanelProfileSecondLife::updateButtons()
gRlvHandler.isException(RLV_BHVR_TPLURE, av_id, ERlvExceptionCheck::Permissive));
mTeleportButton->setEnabled(can_offer_tp);
// </FS:Ansariel>
mAddFriendButton->setEnabled(true);
// <FS:Zi> Add "Remove Friend" button to profile
// mAddFriendButton->setEnabled(true);
mAddFriendButton->setVisible(true);
mRemoveFriendButton->setVisible(false);
// </FS:Zi>
}
// <FS:Ansariel> RLVa support

1
indra/newview/llpanelprofile.h
View File

@ -243,6 +243,7 @@ private:
LLButton* mBlockButton;
LLButton* mUnblockButton;
LLButton* mAddFriendButton;
LLButton* mRemoveFriendButton; // <FS:Zi> Add "Remove Friend" button to profile
LLButton* mPayButton;
LLButton* mIMButton;
LLMenuButton* mOverflowButton;

10
indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
View File

@ -670,6 +670,16 @@
layout="topleft"
label_selected="Add Friend"
/>
<button
name="remove_friend"
label="Remove Friend"
tool_tip="Terminate friendship with the Resident"
top_delta="0"
height="20"
follows="left|top|right"
layout="topleft"
label_selected="Remove Friend"
/>
<button
name="block"
label="Block"

10
indra/newview/skins/vintage/xui/en/panel_profile_secondlife.xml
View File

@ -657,6 +657,16 @@
layout="topleft"
label_selected="Add Friend" />
<button
name="remove_friend"
label="Remove Friend"
tool_tip="Terminate friendship with the Resident"
top_delta="0"
height="20"
follows="left|top|right"
layout="topleft"
label_selected="Remove Friend" />
<button
name="block"
label="Block"