diff options
| author | Baker Linden <baker@lindenlab.com> | 2014-03-11 16:32:23 -0700 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2014-03-11 16:32:23 -0700 |
| commit | 6137e120d1836ea37ea8f5f6723d86db94f31bd8 (patch) | |
| tree | 16341e6203400d52e89189d96206c26e899dbe44 /indra/newview/llconversationview.cpp | |
| parent | b0c1dd4790847364ebcab1cb1d4103500f64072e (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
3.7.4. merge
Diffstat (limited to 'indra/newview/llconversationview.cpp')
| -rw-r--r-- | indra/newview/llconversationview.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 82d3fe74c0..90800fee58 100644 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -267,7 +267,6 @@ 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()); @@ -282,7 +281,6 @@ BOOL LLConversationViewSession::handleMouseDown( S32 x, S32 y, MASK mask ) { im_container->collapseMessagesPane(false); } - } selectConversationItem(); } |