diff options
Diffstat (limited to 'indra/newview/llavatarlistitem.h')
| -rw-r--r-- | indra/newview/llavatarlistitem.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index 79303b55cc..96097bc9b5 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -46,14 +46,14 @@ class LLAvatarIconCtrl; class LLAvatarListItem : public LLPanel, public LLFriendObserver { public: - typedef enum e_item_style_type { + typedef enum e_item_state_type { IS_DEFAULT, IS_VOICE_INVITED, IS_VOICE_JOINED, IS_VOICE_LEFT, IS_ONLINE, IS_OFFLINE, - } EItemStyle; + } EItemState; class ContextMenu { @@ -82,7 +82,7 @@ public: void setOnline(bool online); void setName(const std::string& name); void setHighlight(const std::string& highlight); - void setStyle(EItemStyle item_style); + void setState(EItemState item_style); void setAvatarId(const LLUUID& id, bool ignore_status_changes = false); void setLastInteractionTime(U32 secs_since); //Show/hide profile/info btn, translating speaker indicator and avatar name coordinates accordingly @@ -129,10 +129,10 @@ private: std::string formatSeconds(U32 secs); - typedef std::map<EItemStyle, LLStyle::Params> item_style_map_t; + typedef std::map<EItemState, LLStyle::Params> item_style_map_t; static item_style_map_t& getItemStylesParams(); - typedef std::map<EItemStyle, LLColor4> icon_color_map_t; + typedef std::map<EItemState, LLColor4> icon_color_map_t; static icon_color_map_t& getItemIconColorMap(); LLTextBox* mAvatarName; |