diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-08 20:16:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-08 20:16:35 -0400 |
| commit | 093fdcfcd3debd74dc773bf52faa07ea9f5f8b31 (patch) | |
| tree | 9b3a0f7e37ef731cb9d35ef4e87c17a4c3c4b255 /indra/llui/llview.cpp | |
| parent | 187bc5211437718016a22e60c7b5ed29823c8510 (diff) | |
| parent | 255fc0401ebde80cfde88995a18fc77a36e3479b (diff) | |
merge changes for storm-1489
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 245126d178..8803d106ba 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1299,15 +1299,7 @@ void LLView::drawChildren() { if (!mChildList.empty()) { - static const LLRect* rootRect = NULL; - - if (!mParentView) - { - rootRect = &mRect; - } - - LLRect screenRect; - + LLView* rootp = LLUI::getRootView(); ++sDepth; for (child_list_reverse_iter_t child_iter = mChildList.rbegin(); child_iter != mChildList.rend();) // ++child_iter) @@ -1317,9 +1309,8 @@ void LLView::drawChildren() if (viewp->getVisible() && viewp->getRect().isValid()) { - // Only draw views that are within the root view - localRectToScreen(viewp->getRect(),&screenRect); - if ( rootRect->overlaps(screenRect) && LLUI::sDirtyRect.overlaps(screenRect)) + LLRect screen_rect = viewp->calcScreenRect(); + if ( rootp->getLocalRect().overlaps(screen_rect) && LLUI::sDirtyRect.overlaps(screen_rect)) { LLUI::pushMatrix(); { |