diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-02-21 23:22:40 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-02-21 23:22:40 +0000 |
| commit | 7f1b4b22e69f2ad9c404b2e54a17c2ed4fa161da (patch) | |
| tree | b5ac7ac56e27105fcbf04d02aaebe31fdb6ce083 /indra/newview/llconversationview.cpp | |
| parent | 01d4fd2451f6ba2f4f17c7fbf0f9511d37b20e21 (diff) | |
| parent | 7674c00fb934b1269192553ccd0cd029d65a4e24 (diff) | |
Merge master (rel 6.3.8) to DRTVWR-440 (pull request #11)
Diffstat (limited to 'indra/newview/llconversationview.cpp')
| -rw-r--r-- | indra/newview/llconversationview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 0075b62100..60a5204547 100644 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -175,7 +175,7 @@ BOOL LLConversationViewSession::postBuild() LLAvatarIconCtrl* icon = mItemPanel->getChild<LLAvatarIconCtrl>("avatar_icon"); icon->setVisible(true); icon->setValue(session->mOtherParticipantID); - mSpeakingIndicator->setSpeakerId(gAgentID, session->mSessionID, true); + mSpeakingIndicator->setSpeakerId(session->mOtherParticipantID, session->mSessionID, true); mHasArrow = false; } break; |