Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove now redundant partner profile button

Browse Source
This commit is contained in:
Liru Færs
2019-10-10 13:14:52 -04:00
parent c6089637e7
commit b2eb4ea70c
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llpanelavatar.cpp
View File

@@ -162,8 +162,6 @@ void LLPanelAvatarSecondLife::clearControls()
childSetTextArg("partner_edit", "[NAME]", LLStringUtil::null); childSetTextArg("partner_edit", "[NAME]", LLStringUtil::null);
mPartnerID = LLUUID::null; mPartnerID = LLUUID::null;
if (LLUICtrl* ctrl = getChild<LLUICtrl>("partner_info"))
ctrl->setEnabled(mPartnerID.notNull());
getChild<LLScrollListCtrl>("groups")->deleteAllItems(); getChild<LLScrollListCtrl>("groups")->deleteAllItems();
} }
@@ -210,11 +208,7 @@ void LLPanelAvatarSecondLife::processProperties(void* data, EAvatarProcessorType
childSetValue("allow_publish", allow_publish); childSetValue("allow_publish", allow_publish);
mPartnerID = pAvatarData->partner_id; mPartnerID = pAvatarData->partner_id;
if (mPartnerID.notNull())
{
getChildView("partner_edit")->setValue(mPartnerID); getChildView("partner_edit")->setValue(mPartnerID);
childSetEnabled("partner_info", TRUE);
}
} }
} }
else if (type == APT_GROUPS) else if (type == APT_GROUPS)
@@ -353,11 +347,6 @@ BOOL LLPanelAvatarSecondLife::postBuild()
childSetEnabled("born", FALSE); childSetEnabled("born", FALSE);
childSetEnabled("partner_edit", FALSE); childSetEnabled("partner_edit", FALSE);
getChild<LLUICtrl>("partner_help")->setCommitCallback(boost::bind(show_partner_help)); 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")); childSetAction("?", boost::bind(LLNotificationsUtil::add, "ClickPublishHelpAvatar"));
LLPanelAvatar* pa = getPanelAvatar(); LLPanelAvatar* pa = getPanelAvatar();

6
indra/newview/skins/default/xui/en-us/panel_avatar.xml
View File

@@ -69,11 +69,7 @@
Partner: Partner:
</text> </text>
<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
height="18" label="i" label_selected="i" left_delta="95" height="18" label="?" label_selected="?" left_delta="119"
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"
mouse_opaque="true" name="partner_help" width="18" /> mouse_opaque="true" name="partner_help" width="18" />
<name_editor bevel_style="in" border_style="line" <name_editor bevel_style="in" border_style="line"
border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top" border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"