diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-12-24 14:31:48 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-12-24 14:31:48 +0200 |
| commit | 8f81b5dbe4ff0a0d6486e5325250650986f6a81e (patch) | |
| tree | b233ec9b213f379a50189a0947762e5fddf531b2 /indra/newview/llavatarlistitem.h | |
| parent | d75ba371a2fbbd5af981168dffe86079357ef719 (diff) | |
Work on normal task EXT-3636 (Code Improvements: Voice control panels - Make Voice states and fade timeout xml driven)
-- Code cleaned up: renamed variables related to item styles,
-- changed signature of LLAvatarListItem::getItemStylesParams & LLAvatarListItem::getItemIconColorMap to return a reference to avoid calling of plural copy constructors.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llavatarlistitem.h')
| -rw-r--r-- | indra/newview/llavatarlistitem.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index ed556fbcb4..8e359f16b3 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -82,7 +82,7 @@ public: void setOnline(bool online); void setName(const std::string& name); void setHighlight(const std::string& highlight); - void setStyle(EItemStyle voice_state); + void setStyle(EItemStyle 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 @@ -127,11 +127,11 @@ private: std::string formatSeconds(U32 secs); - typedef std::map<EItemStyle, LLStyle::Params> voice_state_map_t; - static voice_state_map_t getItemStylesParams(); + typedef std::map<EItemStyle, LLStyle::Params> item_style_map_t; + static item_style_map_t& getItemStylesParams(); typedef std::map<EItemStyle, LLColor4> icon_color_map_t; - static icon_color_map_t getItemIconColorMap(); + static icon_color_map_t& getItemIconColorMap(); LLAvatarIconCtrl* mAvatarIcon; LLTextBox* mAvatarName; |