diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
| commit | 667ca55bad0108c4bdf8f007b89e1a52fc766aad (patch) | |
| tree | 7bd62ac8d9af079c3994565f3f200ccc250bbc28 /indra/llui/llview.cpp | |
| parent | 95f365789f4cebc7bd97ccefd538f14d481a8373 (diff) | |
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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(); |