summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-10-05 12:51:31 -0700
committerMerov Linden <merov@lindenlab.com>2012-10-05 12:51:31 -0700
commitaeeeae2690c9ea612667ed46021e17cb083510e5 (patch)
tree190ee98fc85df7635fe3ceb413de334884f8b1b0
parent99fec568b348f91135fc3a0affbcd55a078f771c (diff)
CHUI-364 : Fixed. Do not render participants widgets when closing a conversation handle.
-rwxr-xr-xindra/newview/llconversationview.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index d4eb551f7a..416e6da2da 100755
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -181,10 +181,8 @@ void LLConversationViewSession::draw()
// draw highlight for selected items
drawHighlight(show_context, true, sHighlightBgColor, sFocusOutlineColor, sMouseOverColor);
- // draw children if root folder, or any other folder that is open or animating to closed state
- bool draw_children = getRoot() == static_cast<LLFolderViewFolder*>(this)
- || isOpen()
- || mCurHeight != mTargetHeight;
+ // Draw children if root folder, or any other folder that is open. Do not draw children when animating to closed state or you get rendering overlap.
+ bool draw_children = getRoot() == static_cast<LLFolderViewFolder*>(this) || isOpen();
for (folders_t::iterator iter = mFolders.begin();
iter != mFolders.end();)