summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-03-05 17:36:51 +0000
committerCho <cho@lindenlab.com>2013-03-05 17:36:51 +0000
commit6600c6dcc910cc7468f9f9eaac42a5df0ccf75cf (patch)
tree4a06e0b55a142d067d49d7a70275ab030a604c55
parent477920b13834c977659d11d91d8f2d52e05f54b8 (diff)
parenta5861a4a49b06fe8e61c5d120df637062e10799d (diff)
merging
-rwxr-xr-xindra/newview/llconversationview.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 882ef64715..74b348cd81 100755
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -567,6 +567,7 @@ BOOL LLConversationViewParticipant::handleMouseDown( S32 x, S32 y, MASK mask )
LLFloaterIMContainer *im_container = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container");
LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(session_id);
+ im_container->setSelectedSession(session_id);
im_container->flashConversationItemWidget(session_id,false);
im_container->selectFloater(session_floater);
im_container->collapseMessagesPane(false);