livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-3343 FIXED Expand/Collapse message pan only on left click.

master
Mnikolenko ProductEngine 2013-10-28 14:37:06 +02:00
parent 7b3e017096
commit d5877bc365
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llconversationview.cpp
View File

@ -267,6 +267,23 @@ BOOL LLConversationViewSession::handleMouseDown( S32 x, S32 y, MASK mask )
//This node (conversation) was selected and a child (participant) was not
if(result && getRoot())
{
if(getRoot()->getCurSelectedItem() == this)
{
LLConversationItem* item = dynamic_cast<LLConversationItem *>(getViewModelItem());
LLUUID session_id = item? item->getUUID() : LLUUID();
LLFloaterIMContainer *im_container = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container");
if (im_container->isConversationsPaneCollapsed() && im_container->getSelectedSession() == session_id)
{
im_container->collapseMessagesPane(!im_container->isMessagesPaneCollapsed());
}
else
{
im_container->collapseMessagesPane(false);
}
}
selectConversationItem();
}
@ -316,14 +333,6 @@ void LLConversationViewSession::selectConversationItem()
LLUUID session_id = item? item->getUUID() : LLUUID();
LLFloaterIMContainer *im_container = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container");
if (im_container->isConversationsPaneCollapsed() && im_container->getSelectedSession() == session_id)
{
im_container->collapseMessagesPane(!im_container->isMessagesPaneCollapsed());
}
else
{
im_container->collapseMessagesPane(false);
}
im_container->flashConversationItemWidget(session_id,false);
im_container->selectConversationPair(session_id, false);
}