diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2012-11-09 19:44:37 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2012-11-09 19:44:37 +0200 |
| commit | 5790565ec6a2885fbe494c04c687e98cabf514a6 (patch) | |
| tree | 517b66e77a809eee1146175ed4476ccb5a6815e2 /indra | |
| parent | 486bdf32845e248ec4923224f1f4ea5d239ac0f3 (diff) | |
Additional fix for CHUI-473
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llconversationview.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 3495d74191..295dd2ae6d 100755 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -207,11 +207,11 @@ BOOL LLConversationViewSession::handleMouseDown( S32 x, S32 y, MASK mask ) { LLConversationItem* item = dynamic_cast<LLConversationItem *>(getViewModelItem()); LLUUID session_id = item? item->getUUID() : LLUUID(); - + BOOL result = LLFolderViewFolder::handleMouseDown(x, y, mask); (LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"))-> selectConversationPair(session_id, false); - return LLFolderViewFolder::handleMouseDown(x, y, mask); + return result; } // virtual @@ -240,7 +240,7 @@ void LLConversationViewSession::toggleOpen() { getParentFolder()->setSelection(this, true); } - + } } @@ -504,11 +504,11 @@ BOOL LLConversationViewParticipant::handleMouseDown( S32 x, S32 y, MASK mask ) item = dynamic_cast<LLConversationItem*>(session_widget->getViewModelItem()); } LLUUID session_id = item? item->getUUID() : LLUUID(); + BOOL result = LLFolderViewItem::handleMouseDown(x, y, mask); + (LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"))-> + selectConversationPair(session_id, false); - (LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"))-> - selectConversationPair(session_id, false); - - return LLFolderViewItem::handleMouseDown(x, y, mask); + return result; } S32 LLConversationViewParticipant::getLabelXPos() |