diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-12-30 00:45:11 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-12-30 00:45:11 -0500 |
| commit | f4e2287175ab1bc9d09fc73435a828071b9e2ba5 (patch) | |
| tree | a3e863efea52678e6ea3f19302bef1d5500fcf42 /indra/newview/llavatarlistitem.cpp | |
| parent | 904de223b6da701e2512b8d8bf0d3be478421c78 (diff) | |
| parent | 383cb255e0ff619fa4ee3fc0b1dc6a37643d3bc1 (diff) | |
automated merge PE->viewer2.0
Diffstat (limited to 'indra/newview/llavatarlistitem.cpp')
| -rw-r--r-- | indra/newview/llavatarlistitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index 8bc11b0c1c..6945ac6932 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -165,7 +165,7 @@ void LLAvatarListItem::setOnline(bool online) mOnlineStatus = (EOnlineStatus) online; // Change avatar name font style depending on the new online status. - setStyle(online ? IS_ONLINE : IS_OFFLINE); + setState(online ? IS_ONLINE : IS_OFFLINE); } void LLAvatarListItem::setName(const std::string& name) @@ -178,7 +178,7 @@ void LLAvatarListItem::setHighlight(const std::string& highlight) setNameInternal(mAvatarName->getText(), mHighlihtSubstring = highlight); } -void LLAvatarListItem::setStyle(EItemStyle item_style) +void LLAvatarListItem::setState(EItemState item_style) { item_style_map_t& item_styles_params_map = getItemStylesParams(); |