diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2012-09-18 18:07:16 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-09-18 18:07:16 +0300 |
| commit | 3fb222e939de7ef71630c5754d964fb81e08fce1 (patch) | |
| tree | 4ffd8c154190c08fcea53ba8e5fc73e806c9de84 /indra/newview/llconversationloglistitem.cpp | |
| parent | a3607a8d8c86b2c25bfa0abda1b0fc9b00f2c099 (diff) | |
CHUI-348 FIXED (Voice call icon still shows in conversation log)
- Removed code responsible for showing voice icon
Diffstat (limited to 'indra/newview/llconversationloglistitem.cpp')
| -rw-r--r-- | indra/newview/llconversationloglistitem.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/llconversationloglistitem.cpp b/indra/newview/llconversationloglistitem.cpp index fac6130371..b4ae5f19da 100644 --- a/indra/newview/llconversationloglistitem.cpp +++ b/indra/newview/llconversationloglistitem.cpp @@ -49,10 +49,9 @@ LLConversationLogListItem::LLConversationLogListItem(const LLConversation* conve LLIMFloater* floater = LLIMFloater::findInstance(mConversation->getSessionID()); - bool has_offline_ims = !mConversation->isVoice() && mConversation->hasOfflineMessages(); bool ims_are_read = LLIMFloater::isVisible(floater) && floater->hasFocus(); - if (has_offline_ims && !ims_are_read) + if (mConversation->hasOfflineMessages() && !ims_are_read) { mIMFloaterShowedConnection = LLIMFloater::setIMFloaterShowedCallback(boost::bind(&LLConversationLogListItem::onIMFloaterShown, this, _1)); } @@ -104,16 +103,9 @@ void LLConversationLogListItem::initIcons() break; } - if (mConversation->isVoice()) + if (mConversation->hasOfflineMessages()) { - getChild<LLIconCtrl>("voice_session_icon")->setVisible(TRUE); - } - else - { - if (mConversation->hasOfflineMessages()) - { getChild<LLIconCtrl>("unread_ims_icon")->setVisible(TRUE); - } } } |
