diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-07 17:11:30 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-07 17:11:30 -0800 |
| commit | 4ee2b01b304b5c95fd4b1d73109033d37e84cb25 (patch) | |
| tree | a9daa67e94ae62cab5ecacf1743d02ce2e0a21e4 /indra/newview/llconversationview.cpp | |
| parent | 87c94625d39a72ce8b19b2c295c3824fb45717a3 (diff) | |
| parent | bfb22638f865c2270fad95c35eff273b134772e3 (diff) | |
Pull from viewer-chui, had to resolve conflicts on llimfloatercontainer.cpp
Diffstat (limited to 'indra/newview/llconversationview.cpp')
| -rwxr-xr-x | indra/newview/llconversationview.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 87532268e7..c6b970158f 100755 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -133,6 +133,7 @@ BOOL LLConversationViewSession::postBuild() LLGroupIconCtrl* icon = mItemPanel->getChild<LLGroupIconCtrl>("group_icon"); icon->setVisible(true); mSpeakingIndicator->setSpeakerId(gAgentID, vmi->getUUID(), true); + break; } case LLConversationItem::CONV_SESSION_GROUP: { @@ -344,6 +345,15 @@ void LLConversationViewSession::onCurrentVoiceSessionChanged(const LLUUID& sessi } } +void LLConversationViewSession::drawOpenFolderArrow(const LLFolderViewItem::Params& default_params, const LLUIColor& fg_color) +{ + LLConversationItem * itemp = dynamic_cast<LLConversationItem*>(getViewModelItem()); + if (itemp && itemp->getType() != LLConversationItem::CONV_SESSION_1_ON_1) + { + LLFolderViewFolder::drawOpenFolderArrow(default_params, fg_color); + } +} + // // Implementation of conversations list participant (avatar) widgets // |