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

Work on major bug EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel) 

-- cleanup: remove deprecated commented out code

--HG--
branch : product-engine
meow-7.2.2
Mike Antipov 2010-01-14 18:38:38 +02:00
parent fc633fce71
commit 4f95501f91
1 changed files with 2 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
indra/newview/llavatarlistitem.cpp
View File

@ -91,39 +91,15 @@ BOOL LLAvatarListItem::postBuild()
mProfileBtn->setVisible(false);
mProfileBtn->setClickedCallback(boost::bind(&LLAvatarListItem::onProfileBtnClick, this));
// Remember avatar icon width including its padding from the name text box,
// so that we can hide and show the icon again later.
if (!sStaticInitialized)
{
// Remember children widths including their padding from the next sibling,
// so that we can hide and show them again later.
initChildrenWidths(this);
sStaticInitialized = true;
}
/*
if(!p.buttons.profile)
{
delete mProfile;
mProfile = NULL;
LLRect rect;
rect.setLeftTopAndSize(mName->getRect().mLeft, mName->getRect().mTop, mName->getRect().getWidth() + 30, mName->getRect().getHeight());
mName->setRect(rect);
if(mLocator)
{
rect.setLeftTopAndSize(mLocator->getRect().mLeft + 30, mLocator->getRect().mTop, mLocator->getRect().getWidth(), mLocator->getRect().getHeight());
mLocator->setRect(rect);
}
if(mInfo)
{
rect.setLeftTopAndSize(mInfo->getRect().mLeft + 30, mInfo->getRect().mTop, mInfo->getRect().getWidth(), mInfo->getRect().getHeight());
mInfo->setRect(rect);
}
}
*/
return TRUE;
}
@ -275,26 +251,6 @@ void LLAvatarListItem::setAvatarIconVisible(bool visible)
void LLAvatarListItem::onInfoBtnClick()
{
LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", mAvatarId));
/* TODO fix positioning of inspector
localPointToScreen(mXPos, mYPos, &mXPos, &mYPos);
LLRect rect;
// *TODO Vadim: rewrite this. "+= -" looks weird.
S32 delta = mYPos - inspector->getRect().getHeight();
if(delta < 0)
{
mYPos += -delta;
}
rect.setLeftTopAndSize(mXPos, mYPos,
inspector->getRect().getWidth(), inspector->getRect().getHeight());
inspector->setRect(rect);
inspector->setFrontmost(true);
inspector->setVisible(true);
*/
}
void LLAvatarListItem::onProfileBtnClick()