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

- Fixed a typo (renamed mPaticipants to mParticipants). 

--HG--
branch : product-engine
meow-7.2.2
Vadim Savchuk 2009-12-25 20:19:16 +02:00
parent de485d96a4
commit 635305d2fd
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llcallfloater.cpp
View File

@ -104,7 +104,7 @@ LLCallFloater::Params::Params()
LLCallFloater::LLCallFloater(const LLSD& key)
: LLDockableFloater(NULL, false, key)
, mSpeakerManager(NULL)
, mPaticipants(NULL)
, mParticipants(NULL)
, mAvatarList(NULL)
, mNonAvatarCaller(NULL)
, mVoiceType(VC_LOCAL_CHAT)
@ -123,8 +123,8 @@ LLCallFloater::~LLCallFloater()
{
resetVoiceRemoveTimers();
delete mPaticipants;
mPaticipants = NULL;
delete mParticipants;
mParticipants = NULL;
mAvatarListRefreshConnection.disconnect();
@ -188,8 +188,8 @@ void LLCallFloater::draw()
}
// Need to resort the participant list if it's in sort by recent speaker order.
if (mPaticipants)
mPaticipants->updateRecentSpeakersOrder();
if (mParticipants)
mParticipants->updateRecentSpeakersOrder();
LLDockableFloater::draw();
}
@ -197,7 +197,7 @@ void LLCallFloater::draw()
// virtual
void LLCallFloater::onChange()
{
if (NULL == mPaticipants) return;
if (NULL == mParticipants) return;
updateParticipantsVoiceState();
}
@ -313,8 +313,8 @@ void LLCallFloater::refreshParticipantList()
// ...and for speaker state
mSpeakerStateMap.clear();
delete mPaticipants;
mPaticipants = NULL;
delete mParticipants;
mParticipants = NULL;
mAvatarList->clear();
bool non_avatar_caller = false;
@ -334,7 +334,7 @@ void LLCallFloater::refreshParticipantList()
if (!non_avatar_caller)
{
mPaticipants = new LLParticipantList(mSpeakerManager, mAvatarList, true, mVoiceType != VC_GROUP_CHAT && mVoiceType != VC_AD_HOC_CHAT);
mParticipants = new LLParticipantList(mSpeakerManager, mAvatarList, true, mVoiceType != VC_GROUP_CHAT && mVoiceType != VC_AD_HOC_CHAT);
if (LLLocalSpeakerMgr::getInstance() == mSpeakerManager)
{

2
indra/newview/llcallfloater.h
View File

@ -191,7 +191,7 @@ private:
private:
speaker_state_map_t mSpeakerStateMap;
LLSpeakerMgr* mSpeakerManager;
LLParticipantList* mPaticipants;
LLParticipantList* mParticipants;
LLAvatarList* mAvatarList;
LLNonAvatarCaller* mNonAvatarCaller;
EVoiceControls mVoiceType;