diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-20 21:26:56 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-20 21:26:56 +0300 |
| commit | 84c8050ca0a39fe16a40d3fb9870160ad3fbee84 (patch) | |
| tree | fdefd49f001284849eedbfe6b2d89db42fbc7543 /indra | |
| parent | 695ca70b2b22e16f932afe0ecddbe72a3ff92af1 (diff) | |
CHUI-149 [WIP] Add the participant list to the nearby chat as IM-conversation
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimconversation.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index c3dba3e49e..f12821352b 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -120,8 +120,11 @@ BOOL LLIMConversation::tick() } void LLIMConversation::buildParticipantList() -{ if (mIsNearbyChat) +{ + if (mIsNearbyChat) { + LLLocalSpeakerMgr* speaker_manager = LLLocalSpeakerMgr::getInstance(); + mParticipantList = new LLParticipantList(speaker_manager, getChild<LLAvatarList>("speakers_list"), true, false); } else { @@ -212,8 +215,7 @@ void LLIMConversation::updateHeaderAndToolbar() bool is_participant_list_visible = !is_hosted && gSavedSettings.getBOOL("IMShowControlPanel") - && !mIsP2PChat - && !mIsNearbyChat; // *TODO: temporarily disabled for Nearby chat + && !mIsP2PChat; mParticipantListPanel->setVisible(is_participant_list_visible); @@ -223,7 +225,7 @@ void LLIMConversation::updateHeaderAndToolbar() mExpandCollapseBtn->setImageOverlay(getString(is_expanded ? "collapse_icon" : "expand_icon")); // The button (>>) should be disabled for torn off P2P conversations. - mExpandCollapseBtn->setEnabled(is_hosted || !mIsP2PChat && !mIsNearbyChat); + mExpandCollapseBtn->setEnabled(is_hosted || !mIsP2PChat); if (mDragHandle) { |