livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup: Updated method name. 

--HG--
branch : product-engine
meow-7.2.2
Mike Antipov 2009-12-28 18:14:27 +02:00
parent b58cd620f7
commit 79fba14bd4
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llavatarlistitem.cpp
View File

@ -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();

10
indra/newview/llavatarlistitem.h
View File

@ -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;

6
indra/newview/llcallfloater.cpp
View File

@ -618,16 +618,16 @@ void LLCallFloater::setState(LLAvatarListItem* item, ESpeakerState state)
switch (state)
{
case STATE_INVITED:
item->setStyle(LLAvatarListItem::IS_VOICE_INVITED);
item->setState(LLAvatarListItem::IS_VOICE_INVITED);
break;
case STATE_JOINED:
removeVoiceRemoveTimer(item->getAvatarId());
item->setStyle(LLAvatarListItem::IS_VOICE_JOINED);
item->setState(LLAvatarListItem::IS_VOICE_JOINED);
break;
case STATE_LEFT:
{
setVoiceRemoveTimer(item->getAvatarId());
item->setStyle(LLAvatarListItem::IS_VOICE_LEFT);
item->setState(LLAvatarListItem::IS_VOICE_LEFT);
}
break;
default: