diff options
author | Aleric Inglewood | 2010-10-15 18:02:40 +0200 |
---|---|---|
committer | Aleric Inglewood | 2010-10-15 18:02:40 +0200 |
commit | b2d616b732943817b7e705fc8f6c4be9beee3def (patch) | |
tree | 9f7ba1665cb8439fea6fd4a7d589c023145281a0 /linden/indra/llui | |
parent | Comment out code to make it compile at all (with the latest llqtwebkit). (diff) | |
download | meta-impy-b2d616b732943817b7e705fc8f6c4be9beee3def.zip meta-impy-b2d616b732943817b7e705fc8f6c4be9beee3def.tar.gz meta-impy-b2d616b732943817b7e705fc8f6c4be9beee3def.tar.bz2 meta-impy-b2d616b732943817b7e705fc8f6c4be9beee3def.tar.xz |
Rename LLRect::isNull to LLRect::isEmpty (a random thing I picked up from snowglobe 2.x).
Diffstat (limited to 'linden/indra/llui')
-rw-r--r-- | linden/indra/llui/llpanel.cpp | 2 | ||||
-rw-r--r-- | linden/indra/llui/llview.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp index 26137d7..07e78ed 100644 --- a/linden/indra/llui/llpanel.cpp +++ b/linden/indra/llui/llpanel.cpp | |||
@@ -1171,7 +1171,7 @@ void LLLayoutStack::draw() | |||
1171 | 1171 | ||
1172 | LLLocalClipRect clip(clip_rect); | 1172 | LLLocalClipRect clip(clip_rect); |
1173 | // only force drawing invisible children if visible amount is non-zero | 1173 | // only force drawing invisible children if visible amount is non-zero |
1174 | drawChild(panelp, 0, 0, !clip_rect.isNull()); | 1174 | drawChild(panelp, 0, 0, !clip_rect.isEmpty()); |
1175 | } | 1175 | } |
1176 | } | 1176 | } |
1177 | 1177 | ||
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp index 1f76696..d4eda8f 100644 --- a/linden/indra/llui/llview.cpp +++ b/linden/indra/llui/llview.cpp | |||
@@ -1542,7 +1542,7 @@ void LLView::updateBoundingRect() | |||
1542 | 1542 | ||
1543 | LLRect child_bounding_rect = childp->getBoundingRect(); | 1543 | LLRect child_bounding_rect = childp->getBoundingRect(); |
1544 | 1544 | ||
1545 | if (local_bounding_rect.isNull()) | 1545 | if (local_bounding_rect.isEmpty()) |
1546 | { | 1546 | { |
1547 | // start out with bounding rect equal to first visible child's bounding rect | 1547 | // start out with bounding rect equal to first visible child's bounding rect |
1548 | local_bounding_rect = child_bounding_rect; | 1548 | local_bounding_rect = child_bounding_rect; |
@@ -1550,7 +1550,7 @@ void LLView::updateBoundingRect() | |||
1550 | else | 1550 | else |
1551 | { | 1551 | { |
1552 | // accumulate non-null children rectangles | 1552 | // accumulate non-null children rectangles |
1553 | if (!child_bounding_rect.isNull()) | 1553 | if (!child_bounding_rect.isEmpty()) |
1554 | { | 1554 | { |
1555 | local_bounding_rect.unionWith(child_bounding_rect); | 1555 | local_bounding_rect.unionWith(child_bounding_rect); |
1556 | } | 1556 | } |