diff options
author | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
commit | 54bba824228162724a1d46d9c7900e9aa7a077a3 (patch) | |
tree | 3355699f63f141e5fc0546dfe279b8aa65d40e07 /indra/newview/llconversationview.cpp | |
parent | f813a25224081e68d4772676909d2cff14407486 (diff) | |
parent | 78eada5b6c3a8d20a2ea49887ab7c091e4b6fa14 (diff) |
Pull merge from lindenlab/viewer-release
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(); } |