diff options
author | maximbproductengine <maximbproductengine@lindenlab.com> | 2013-01-03 06:35:40 +0200 |
---|---|---|
committer | maximbproductengine <maximbproductengine@lindenlab.com> | 2013-01-03 06:35:40 +0200 |
commit | f40ee4792d948ca99d19bdd6f645faea07e15f47 (patch) | |
tree | 91df7dd750d080493923766d37da588ca3f1f2d7 /indra/newview/llconversationview.cpp | |
parent | 034143225ba60e8bb1163501e2f57c2be932578b (diff) |
CHUI-616 (Left Click on participant name in torn off conference moves focus to conversation floater)
Diffstat (limited to 'indra/newview/llconversationview.cpp')
-rwxr-xr-x | indra/newview/llconversationview.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index e51efd48f5..903dd2a407 100755 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -547,27 +547,6 @@ void LLConversationViewParticipant::onMouseLeave(S32 x, S32 y, MASK mask) LLFolderViewItem::onMouseLeave(x, y, mask); } -BOOL LLConversationViewParticipant::handleMouseDown( S32 x, S32 y, MASK mask ) -{ - LLConversationItem* item = NULL; - LLConversationViewSession* session_widget = - dynamic_cast<LLConversationViewSession *>(this->getParentFolder()); - if (session_widget) - { - item = dynamic_cast<LLConversationItem*>(session_widget->getViewModelItem()); - } - LLUUID session_id = item? item->getUUID() : LLUUID(); - BOOL result = LLFolderViewItem::handleMouseDown(x, y, mask); - - if(result) - { - (LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"))-> - selectConversationPair(session_id, false); - } - - return result; -} - S32 LLConversationViewParticipant::getLabelXPos() { return getIndentation() + mAvatarIcon->getRect().getWidth() + mIconPad; |