From 667ca55bad0108c4bdf8f007b89e1a52fc766aad Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Mon, 5 Jan 2009 18:59:12 +0000 Subject: svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. --- indra/llui/llview.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/llui/llview.cpp') diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 3e7e59876c..65e9417b8b 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1260,7 +1260,7 @@ void LLView::draw() { LLView *viewp = *child_iter; - if (viewp->getVisible() && viewp != focus_view) + if (viewp->getVisible() && viewp != focus_view && viewp->getRect().isValid()) { // Only draw views that are within the root view localRectToScreen(viewp->getRect(),&screenRect); @@ -1357,7 +1357,8 @@ void LLView::drawChild(LLView* childp, S32 x_offset, S32 y_offset, BOOL force_dr { ++sDepth; - if (childp->getVisible() || force_draw) + if ((childp->getVisible() && childp->getRect().isValid()) + || force_draw) { glMatrixMode(GL_MODELVIEW); LLUI::pushMatrix(); -- cgit v1.2.3