diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-14 20:37:03 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-14 20:37:03 +0000 |
| commit | b5ffeaff1ab53008a8f1ee72cd1f398bd1ff21c2 (patch) | |
| tree | e12431a5c6945b2ece16765bcdb04c241c4d9a96 /indra/newview/llavatarlistitem.cpp | |
| parent | 7475ec05fc81e358a6979f3e9d7050ab91511c57 (diff) | |
merge -r 2014-2032 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
* Bugs: EXT-1005 EXT-1488 EXT-320 EXT-1236 EXT-1236 EXT-1002 EXT-1030
* New Dev: EXT-1293 EXT-1416
Diffstat (limited to 'indra/newview/llavatarlistitem.cpp')
| -rw-r--r-- | indra/newview/llavatarlistitem.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index 51545bcc07..4179d7a58d 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -33,6 +33,7 @@ #include "llviewerprecompiledheaders.h" +#include "llavataractions.h" #include "llavatarlistitem.h" #include "llfloaterreg.h" @@ -49,6 +50,7 @@ LLAvatarListItem::LLAvatarListItem() mStatus(NULL), mSpeakingIndicator(NULL), mInfoBtn(NULL), + mProfileBtn(NULL), mContextMenu(NULL), mAvatarId(LLUUID::null) { @@ -63,10 +65,14 @@ BOOL LLAvatarListItem::postBuild() mSpeakingIndicator = getChild<LLOutputMonitorCtrl>("speaking_indicator"); mInfoBtn = getChild<LLButton>("info_btn"); + mProfileBtn = getChild<LLButton>("profile_btn"); mInfoBtn->setVisible(false); mInfoBtn->setClickedCallback(boost::bind(&LLAvatarListItem::onInfoBtnClick, this)); + mProfileBtn->setVisible(false); + mProfileBtn->setClickedCallback(boost::bind(&LLAvatarListItem::onProfileBtnClick, this)); + /* if(!p.buttons.profile) { @@ -104,6 +110,7 @@ void LLAvatarListItem::onMouseEnter(S32 x, S32 y, MASK mask) { childSetVisible("hovered_icon", true); mInfoBtn->setVisible(true); + mProfileBtn->setVisible(true); LLPanel::onMouseEnter(x, y, mask); } @@ -112,6 +119,7 @@ void LLAvatarListItem::onMouseLeave(S32 x, S32 y, MASK mask) { childSetVisible("hovered_icon", false); mInfoBtn->setVisible(false); + mProfileBtn->setVisible(false); LLPanel::onMouseLeave(x, y, mask); } @@ -171,6 +179,11 @@ void LLAvatarListItem::onInfoBtnClick() */ } +void LLAvatarListItem::onProfileBtnClick() +{ + LLAvatarActions::showProfile(mAvatarId); +} + void LLAvatarListItem::showStatus(bool show_status) { // *HACK: dirty hack until we can determine correct avatar status (EXT-1076). |