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

svn merge -r 57026:57058 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

master
Josh Bell 2007-01-23 22:50:48 +00:00
parent 7f50e28b0f
commit 787ac69d75
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
indra/newview/llpanelavatar.cpp
View File

@ -829,14 +829,17 @@ void LLPanelAvatarClassified::enableControls(BOOL self)
BOOL LLPanelAvatarClassified::titleIsValid()
{
LLTabContainerCommon* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
for (S32 i = 0; i < tabs->getTabCount(); i++)
if ( tabs )
{
LLPanelClassified* panel = (LLPanelClassified*)tabs->getPanelByIndex(i);
if ( ! panel->titleIsValid() )
LLPanelClassified* panel = (LLPanelClassified*)tabs->getCurrentPanel();
if ( panel )
{
return FALSE;
}
}
if ( ! panel->titleIsValid() )
{
return FALSE;
};
};
};
return TRUE;
}
@ -1640,7 +1643,8 @@ void LLPanelAvatar::onClickOK(void *userdata)
{
self->sendAvatarPropertiesUpdate();
if ( self->mPanelClassified->titleIsValid() )
LLTabContainerCommon* tabs = LLUICtrlFactory::getTabContainerByName(self,"tab");
if ( tabs->getCurrentPanel() != self->mPanelClassified )
{
self->mPanelClassified->apply();
@ -1650,6 +1654,19 @@ void LLPanelAvatar::onClickOK(void *userdata)
infop->close();
}
}
else
{
if ( self->mPanelClassified->titleIsValid() )
{
self->mPanelClassified->apply();
LLFloaterAvatarInfo *infop = LLFloaterAvatarInfo::getInstance(self->mAvatarID);
if (infop)
{
infop->close();
}
}
}
}
}