diff options
author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-11-09 12:45:36 +0200 |
---|---|---|
committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-11-09 12:45:36 +0200 |
commit | 486bdf32845e248ec4923224f1f4ea5d239ac0f3 (patch) | |
tree | 3d7634bea08a5aca5394ea2500f602cd325f3ac2 /indra/newview/llconversationloglistitem.cpp | |
parent | 3d70cca7029cc536725088c8ff5d58ad0222eb64 (diff) |
CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
Diffstat (limited to 'indra/newview/llconversationloglistitem.cpp')
-rw-r--r-- | indra/newview/llconversationloglistitem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llconversationloglistitem.cpp b/indra/newview/llconversationloglistitem.cpp index b4ae5f19da..9fad0e603e 100644 --- a/indra/newview/llconversationloglistitem.cpp +++ b/indra/newview/llconversationloglistitem.cpp @@ -47,13 +47,13 @@ LLConversationLogListItem::LLConversationLogListItem(const LLConversation* conve { buildFromFile("panel_conversation_log_list_item.xml"); - LLIMFloater* floater = LLIMFloater::findInstance(mConversation->getSessionID()); + LLFloaterIMSession* floater = LLFloaterIMSession::findInstance(mConversation->getSessionID()); - bool ims_are_read = LLIMFloater::isVisible(floater) && floater->hasFocus(); + bool ims_are_read = LLFloaterIMSession::isVisible(floater) && floater->hasFocus(); if (mConversation->hasOfflineMessages() && !ims_are_read) { - mIMFloaterShowedConnection = LLIMFloater::setIMFloaterShowedCallback(boost::bind(&LLConversationLogListItem::onIMFloaterShown, this, _1)); + mIMFloaterShowedConnection = LLFloaterIMSession::setIMFloaterShowedCallback(boost::bind(&LLConversationLogListItem::onIMFloaterShown, this, _1)); } } |