diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-11 12:18:35 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-11 12:18:35 -0700 |
| commit | b871d67710cc4168752dee976725e190c0cd9960 (patch) | |
| tree | f6c56ec4da61c6bcb7331ba5d16aa133742e4eb6 /indra/newview/llconversationview.cpp | |
| parent | 375f380ea388b37c34ace9570822d0c117b3d2f1 (diff) | |
| parent | 0ff5a0c8ceebfab0d786aaf027c7c548170afe8d (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llconversationview.cpp')
| -rwxr-xr-x | indra/newview/llconversationview.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index 112c38d8b8..f9a3a05e59 100755 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -183,10 +183,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();) |