diff options
Diffstat (limited to 'indra/newview/llcallfloater.h')
| -rw-r--r-- | indra/newview/llcallfloater.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index 537c57f671..3df9e333c5 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -57,12 +57,6 @@ class LLSpeakerMgr; class LLCallFloater : public LLDockableFloater, LLVoiceClientParticipantObserver { public: - struct Params : public LLInitParam::Block<Params, LLDockableFloater::Params> - { - Optional<S32> voice_left_remove_delay; - - Params(); - }; LOG_CLASS(LLCallFloater); @@ -114,7 +108,7 @@ private: /** * Refreshes participant list according to current Voice Channel */ - void refreshPartisipantList(); + void refreshParticipantList(); /** * Handles event on avatar list is refreshed after it was marked dirty. @@ -133,7 +127,7 @@ private: /** * Sets initial participants voice states in avatar list (Invited, Joined, Has Left). * - * @see refreshPartisipantList() + * @see refreshParticipantList() * @see onAvatarListRefreshed() * @see mInitParticipantsVoiceState */ @@ -188,10 +182,20 @@ private: */ void removeVoiceRemoveTimer(const LLUUID& voice_speaker_id); + /** + * Called by LLParticipantList before adding a speaker to the participant list. + * + * If false is returned, the speaker will not be added to the list. + * + * @param speaker_id Speaker to validate. + * @return true if this is a valid speaker, false otherwise. + */ + bool validateSpeaker(const LLUUID& speaker_id); + private: speaker_state_map_t mSpeakerStateMap; LLSpeakerMgr* mSpeakerManager; - LLParticipantList* mPaticipants; + LLParticipantList* mParticipants; LLAvatarList* mAvatarList; LLNonAvatarCaller* mNonAvatarCaller; EVoiceControls mVoiceType; |