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

State of "New Pick" button in legacy profile sometimes not correct

meow-7.2.2
Ansariel 2015-06-30 09:16:11 +02:00
parent fd37324ae3
commit e5b95698cd
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/fspanelprofile.cpp
View File

@ -1598,11 +1598,11 @@ void FSPanelProfilePicks::onOpen(const LLSD& key)
if (getSelfProfile() && !getEmbedded())
{
mNewButton->setVisible( TRUE );
mNewButton->setEnabled( TRUE );
mNewButton->setVisible(TRUE);
mNewButton->setEnabled(TRUE);
mDeleteButton->setVisible( TRUE );
mDeleteButton->setEnabled( TRUE );
mDeleteButton->setVisible(TRUE);
mDeleteButton->setEnabled(TRUE);
}
}
@ -1659,8 +1659,7 @@ bool FSPanelProfilePicks::callbackDeletePick(const LLSD& notification, const LLS
{
LLUUID pick_id = notification["payload"]["pick_id"].asUUID();
LLAvatarPropertiesProcessor::getInstance()->sendPickDelete(pick_id);
// LLAvatarPropertiesProcessor::instance().sendPickDelete(pick_id);
mNewButton->setEnabled(!LLAgentPicksInfo::getInstance()->isPickLimitReached());
mNewButton->setEnabled(!LLAgentPicksInfo::getInstance()->isPickLimitReached() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC));
for (S32 tab_idx = 0; tab_idx < mTabContainer->getTabCount(); ++tab_idx)
{
@ -1717,7 +1716,7 @@ void FSPanelProfilePicks::processProperties(void* data, EAvatarProcessorType typ
label(pick_name));
}
mNewButton->setEnabled(!LLAgentPicksInfo::getInstance()->isPickLimitReached());
mNewButton->setEnabled(!LLAgentPicksInfo::getInstance()->isPickLimitReached() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC));
bool no_data = !mTabContainer->getTabCount();
mNoItemsLabel->setVisible(no_data);
@ -1780,7 +1779,7 @@ void FSPanelProfilePicks::updateRlvRestrictions(ERlvBehaviour behavior, ERlvPara
{
if (behavior == RLV_BHVR_SHOWLOC)
{
mNewButton->setEnabled(type != RLV_TYPE_ADD);
mNewButton->setEnabled(!LLAgentPicksInfo::getInstance()->isPickLimitReached() && type != RLV_TYPE_ADD);
}
}