diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-11 17:51:00 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-11 17:51:00 -0800 |
| commit | b4e738e5034cde1699a7a3cbe51b84c3294eedd0 (patch) | |
| tree | a635b92a70a86ff5d78b483064815fe7c3e083a2 /indra/newview/llconversationview.cpp | |
| parent | 34558181c7fad95c235bca1e29c282ca09d136ba (diff) | |
| parent | 8037b435883f6d0cc0ba01e4f5bdbeea47c99074 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llconversationview.cpp')
| -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; } |