diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-12 03:05:32 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-12-12 03:05:32 +0200 |
| commit | 80bc7e13e128c4b94028fe74755a5999f08e24ce (patch) | |
| tree | 0875905fd44dd3e84343639df90f033d386f2402 /indra/newview | |
| parent | 0e4c3070cb6cfb389d708ca459ed2c721c1cc28a (diff) | |
CHUI-557 (Cannot expand conversation from minimized state by clicking on selected conversation)
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llconversationview.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index f088a8c084..527c0ad233 100755 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -223,10 +223,11 @@ BOOL LLConversationViewSession::handleMouseDown( S32 x, S32 y, MASK mask ) //This node (conversation) was selected and a child (participant) was not if(result && getRoot()->getCurSelectedItem() == this) - { - (LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"))-> - selectConversationPair(session_id, false); - } + { + LLFloaterIMContainer *im_container = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"); + im_container->selectConversationPair(session_id, false); + im_container->collapseMessagesPane(false); + } return result; } |