diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-07 15:05:57 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-07 15:05:57 -0500 |
| commit | 3c00c1ba4590e758f84f5c97f2d407aa7e605ad8 (patch) | |
| tree | 0d6771596b57ecf87f2504066543b56bbcf65d80 /indra/newview/llavatarlistitem.h | |
| parent | efe65d90e027e4385c97d76244844fa8660dc7ce (diff) | |
| parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) | |
merge viewer-development into web-profiles
Diffstat (limited to 'indra/newview/llavatarlistitem.h')
| -rw-r--r-- | indra/newview/llavatarlistitem.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index 52187284eb..c95ac39696 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -36,6 +36,7 @@ #include "llcallingcard.h" // for LLFriendObserver class LLAvatarIconCtrl; +class LLAvatarName; class LLIconCtrl; class LLAvatarListItem : public LLPanel, public LLFriendObserver @@ -50,6 +51,8 @@ public: online_style, offline_style; + Optional<S32> name_right_pad; + Params(); }; @@ -86,7 +89,9 @@ public: virtual void changed(U32 mask); // from LLFriendObserver void setOnline(bool online); - void setName(const std::string& name); + void updateAvatarName(); // re-query the name cache + void setAvatarName(const std::string& name); + void setAvatarToolTip(const std::string& tooltip); void setHighlight(const std::string& highlight); void setState(EItemState item_style); void setAvatarId(const LLUUID& id, const LLUUID& session_id, bool ignore_status_changes = false, bool is_resident = true); @@ -100,7 +105,8 @@ public: void setAvatarIconVisible(bool visible); const LLUUID& getAvatarId() const; - const std::string getAvatarName() const; + std::string getAvatarName() const; + std::string getAvatarToolTip() const; void onInfoBtnClick(); void onProfileBtnClick(); @@ -154,7 +160,7 @@ private: } EAvatarListItemChildIndex; void setNameInternal(const std::string& name, const std::string& highlight); - void onNameCache(const std::string& first_name, const std::string& last_name); + void onAvatarNameCache(const LLAvatarName& av_name); std::string formatSeconds(U32 secs); @@ -211,7 +217,7 @@ private: static bool sStaticInitialized; // this variable is introduced to improve code readability static S32 sLeftPadding; // padding to first left visible child (icon or name) - static S32 sRightNamePadding; // right padding from name to next visible child + static S32 sNameRightPadding; // right padding from name to next visible child /** * Contains widths of each child specified by EAvatarListItemChildIndex |