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

SL-11344 FIXED Private notes are not saved for another avatar

meow-7.2.2
maxim_productengine 2019-06-03 17:19:05 +03:00
parent 2216d0fb38
commit 023a697208
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llfloaterprofile.cpp
View File

@ -54,12 +54,6 @@ void LLFloaterProfile::onOpen(const LLSD& key)
{
mPanelProfile->onOpen(key);
if (mAvatarId == gAgentID)
{
getChild<LLUICtrl>("ok_btn")->setVisible(TRUE);
getChild<LLUICtrl>("cancel_btn")->setVisible(TRUE);
}
// Update the avatar name.
mNameCallbackConnection = LLAvatarNameCache::get(mAvatarId, boost::bind(&LLFloaterProfile::onAvatarNameCache, this, _1, _2));
}
@ -91,11 +85,7 @@ void LLFloaterProfile::showClassified(const LLUUID& classified_id, bool edit)
void LLFloaterProfile::onOKBtn()
{
if (mAvatarId == gAgentID)
{
mPanelProfile->apply();
}
mPanelProfile->apply();
closeFloater();
}

22
indra/newview/llpanelprofile.cpp
View File

@ -1514,6 +1514,13 @@ void LLPanelProfile::onTabChange()
{
active_panel->updateData();
}
updateBtnsVisibility();
}
void LLPanelProfile::updateBtnsVisibility()
{
getChild<LLUICtrl>("ok_btn")->setVisible(((getSelfProfile() && !getEmbedded()) || isNotesTabSelected()));
getChild<LLUICtrl>("cancel_btn")->setVisible(((getSelfProfile() && !getEmbedded()) || isNotesTabSelected()));
}
void LLPanelProfile::onOpen(const LLSD& key)
@ -1557,12 +1564,7 @@ void LLPanelProfile::onOpen(const LLSD& key)
resetLoading();
updateData();
// Only show commit buttons on own profile on floater version
if (getSelfProfile() && !getEmbedded())
{
getChild<LLUICtrl>("ok_btn")->setVisible(TRUE);
getChild<LLUICtrl>("cancel_btn")->setVisible(TRUE);
}
updateBtnsVisibility();
// KC - Not handling pick and classified opening thru onOpen
// because this would make unique profile floaters per slurl
@ -1597,6 +1599,10 @@ void LLPanelProfile::apply()
//KC - Classifieds handles this itself
}
else
{
mPanelNotes->apply();
}
}
void LLPanelProfile::showPick(const LLUUID& pick_id)
@ -1613,6 +1619,10 @@ bool LLPanelProfile::isPickTabSelected()
return (mTabContainer->getCurrentPanel() == mPanelPicks);
}
bool LLPanelProfile::isNotesTabSelected()
{
return (mTabContainer->getCurrentPanel() == mPanelNotes);
}
void LLPanelProfile::showClassified(const LLUUID& classified_id, bool edit)
{

3
indra/newview/llpanelprofile.h
View File

@ -409,6 +409,9 @@ public:
void showPick(const LLUUID& pick_id = LLUUID::null);
bool isPickTabSelected();
bool isNotesTabSelected();
void updateBtnsVisibility();
void showClassified(const LLUUID& classified_id = LLUUID::null, bool edit = false);