diff options
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.h | 1 | ||||
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llparticipantlist.h | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 6479f46283..350b78ee3d 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -249,8 +249,7 @@ void LLPanelGroupControlPanel::setSessionId(const LLUUID& session_id) mGroupID = LLIMModel::getInstance()->getOtherParticipantID(session_id); if(!mParticipantList) - mParticipantList = new LLParticipantList(LLIMModel::getInstance()->getSpeakerManager(session_id), - getChild<LLAvatarList>("speakers_list")); + mParticipantList = new LLParticipantList(mSpeakerManager, getChild<LLAvatarList>("speakers_list")); } diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h index 12de21a46a..a0d3420d23 100644 --- a/indra/newview/llpanelimcontrolpanel.h +++ b/indra/newview/llpanelimcontrolpanel.h @@ -104,7 +104,6 @@ protected: LLParticipantList* mParticipantList; private: - void onVisibilityChange(const LLSD& new_visibility); void onGroupInfoButtonClicked(); void onSortMenuItemClicked(const LLSD& userdata); /*virtual*/ void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state); diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 8155766b49..f5367c0477 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -92,6 +92,11 @@ LLParticipantList::~LLParticipantList() mParticipantListMenu = NULL; } +void LLParticipantList::setSpeakingIndicatorsVisible(BOOL visible) +{ + mAvatarList->setSpeakingIndicatorsVisible(visible); +}; + void LLParticipantList::onAvatarListDoubleClicked(LLAvatarList* list) { LLUUID clicked_id = list->getSelectedUUID(); diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h index 6fe178b023..5e26c39fc8 100644 --- a/indra/newview/llparticipantlist.h +++ b/indra/newview/llparticipantlist.h @@ -34,9 +34,9 @@ #include "llevent.h" #include "llpanelpeoplemenus.h" #include "llimview.h" -#include "llavatarlist.h" class LLSpeakerMgr; +class LLAvatarList; class LLUICtrl; class LLParticipantList @@ -45,7 +45,7 @@ class LLParticipantList public: LLParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list); ~LLParticipantList(); - void setSpeakingIndicatorsVisible(BOOL visible){ mAvatarList->setSpeakingIndicatorsVisible(visible); }; + void setSpeakingIndicatorsVisible(BOOL visible); typedef enum e_participant_sort_oder { E_SORT_BY_NAME = 0, |