From b2eb4ea70c5c3e861e505cd9bc37e41f26395e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Thu, 10 Oct 2019 13:14:52 -0400
Subject: [PATCH] Remove now redundant partner profile button

---
 indra/newview/llpanelavatar.cpp                     | 13 +------------
 .../skins/default/xui/en-us/panel_avatar.xml        |  6 +-----
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 9e4986a47..31e5ce653 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -162,8 +162,6 @@ void LLPanelAvatarSecondLife::clearControls()
 
 	childSetTextArg("partner_edit", "[NAME]", LLStringUtil::null);
 	mPartnerID = LLUUID::null;
-	if (LLUICtrl* ctrl = getChild<LLUICtrl>("partner_info"))
-		ctrl->setEnabled(mPartnerID.notNull());
 
 	getChild<LLScrollListCtrl>("groups")->deleteAllItems();
 }
@@ -210,11 +208,7 @@ void LLPanelAvatarSecondLife::processProperties(void* data, EAvatarProcessorType
 			childSetValue("allow_publish", allow_publish);
 
 			mPartnerID = pAvatarData->partner_id;
-			if (mPartnerID.notNull())
-			{
-				getChildView("partner_edit")->setValue(mPartnerID);
-				childSetEnabled("partner_info", TRUE);
-			}
+			getChildView("partner_edit")->setValue(mPartnerID);
 		}
 	}
 	else if (type == APT_GROUPS)
@@ -353,11 +347,6 @@ BOOL LLPanelAvatarSecondLife::postBuild()
 	childSetEnabled("born", FALSE);
 	childSetEnabled("partner_edit", FALSE);
 	getChild<LLUICtrl>("partner_help")->setCommitCallback(boost::bind(show_partner_help));
-	if (LLUICtrl* ctrl = getChild<LLUICtrl>("partner_info"))
-	{
-		ctrl->setCommitCallback(boost::bind(LLAvatarActions::showProfile, boost::ref(mPartnerID), false));
-		ctrl->setEnabled(mPartnerID.notNull());
-	}
 
 	childSetAction("?", boost::bind(LLNotificationsUtil::add, "ClickPublishHelpAvatar"));
 	LLPanelAvatar* pa = getPanelAvatar();
diff --git a/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 9e0a25ab5..43e8012dc 100644
--- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -69,11 +69,7 @@
 				Partner:
 			</text>
 			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-			     height="18" label="i" label_selected="i" left_delta="95"
-			     mouse_opaque="true" name="partner_info"
-			     tool_tip="Click to open partner&apos;s profile" width="18" />
-			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-			     height="18" label="?" label_selected="?" left_delta="24"
+			     height="18" label="?" label_selected="?" left_delta="119"
 			     mouse_opaque="true" name="partner_help" width="18" />
 			<name_editor bevel_style="in" border_style="line"
 			     border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"