diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-03-27 11:59:35 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-03-27 11:59:35 -0700 |
| commit | dfd78e83d91832b486a5bba6b1bb1cce621163ab (patch) | |
| tree | 5d27537583ea1f06c0e7b469f83ed65c93f70d15 /indra/newview/llconversationview.cpp | |
| parent | 22ea5ac41ca3a1f7a884b56526791f611834f76b (diff) | |
| parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) | |
Pulled merge from 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(); } |