summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationview.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-11-05 18:33:39 -0800
committerMerov Linden <merov@lindenlab.com>2012-11-05 18:33:39 -0800
commit2d9d44e31643214c80bde5ffee03f9b6af6af9d0 (patch)
tree6b0cb7a8a71acfa0838d97a43ac753e63a81bbfc /indra/newview/llconversationview.cpp
parente3524a5fe159566edefb0bbc395e94ee3126adec (diff)
CHUI-468 : WIP : Taking LLAvatarList and related out of LLParticipantList
Diffstat (limited to 'indra/newview/llconversationview.cpp')
-rwxr-xr-xindra/newview/llconversationview.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 81212a9141..87532268e7 100755
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -108,7 +108,7 @@ BOOL LLConversationViewSession::postBuild()
mSessionTitle = mItemPanel->getChild<LLTextBox>("conversation_title");
mActiveVoiceChannelConnection = LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLConversationViewSession::onCurrentVoiceSessionChanged, this, _1));
- mSpeakingIndicator = getChild<LLOutputMonitorCtrl>("speaking_indicatorn");
+ mSpeakingIndicator = getChild<LLOutputMonitorCtrl>("speaking_indicator");
LLConversationItem* vmi = dynamic_cast<LLConversationItem*>(getViewModelItem());
if (vmi)
@@ -476,10 +476,11 @@ void LLConversationViewParticipant::selectItem()
void LLConversationViewParticipant::refresh()
{
// Refresh the participant view from its model data
- LLConversationItem* vmi = dynamic_cast<LLConversationItem*>(getViewModelItem());
+ LLConversationItemParticipant* vmi = dynamic_cast<LLConversationItemParticipant*>(getViewModelItem());
vmi->resetRefresh();
- // Note: for the moment, all that needs to be done is done by LLFolderViewItem::refresh()
+ // *TODO: We should also do something with vmi->isModerator() to echo that state in the UI somewhat
+ mSpeakingIndicator->setIsMuted(vmi->isMuted());
// Do the regular upstream refresh
LLFolderViewItem::refresh();