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

merge

meow-7.2.2
Cho 2013-04-03 04:12:11 +01:00
parent 436bccf58b 2ab6a73c21
commit e35becd071
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/llsociallist.cpp
View File

@ -31,7 +31,10 @@ sDestroyImmediate
#include "llsociallist.h"
#include "llavataractions.h"
#include "llfloaterreg.h"
#include "llavatariconctrl.h"
#include "llavatarnamecache.h"
#include "lloutputmonitorctrl.h"
#include "lltextutil.h"
@ -60,7 +63,16 @@ void LLSocialList::refresh()
void LLSocialList::addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos)
{
LLSocialListItem * item = new LLSocialListItem();
item->setName(name, mNameFilter);
LLAvatarName avatar_name;
bool has_avatar_name = id.notNull() && LLAvatarNameCache::get(id, &avatar_name);
item->mAvatarId = id;
if(id.notNull())
{
item->mIcon->setValue(id);
}
item->setName(has_avatar_name ? avatar_name.mDisplayName + " (" + name + ")" : name, mNameFilter);
addItem(item, id, pos);
}
@ -97,6 +109,9 @@ BOOL LLSocialListItem::postBuild()
mInfoBtn->setVisible(false);
mProfileBtn->setVisible(false);
mInfoBtn->setClickedCallback(boost::bind(&LLSocialListItem::onInfoBtnClick, this));
mProfileBtn->setClickedCallback(boost::bind(&LLSocialListItem::onProfileBtnClick, this));
return TRUE;
}
@ -128,3 +143,13 @@ void LLSocialListItem::onMouseLeave(S32 x, S32 y, MASK mask)
LLPanel::onMouseLeave(x, y, mask);
}
void LLSocialListItem::onInfoBtnClick()
{
LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", mAvatarId));
}
void LLSocialListItem::onProfileBtnClick()
{
LLAvatarActions::showProfile(mAvatarId);
}

4
indra/newview/llsociallist.h
View File

@ -77,6 +77,10 @@ class LLSocialListItem : public LLPanel
void setValue(const LLSD& value);
void onMouseEnter(S32 x, S32 y, MASK mask);
void onMouseLeave(S32 x, S32 y, MASK mask);
void onInfoBtnClick();
void onProfileBtnClick();
LLUUID mAvatarId;
LLTextBox * mLabelTextBox;
std::string mLabel;