From b2d616b732943817b7e705fc8f6c4be9beee3def Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Fri, 15 Oct 2010 18:02:40 +0200
Subject: Rename LLRect::isNull to LLRect::isEmpty (a random thing I picked up
 from snowglobe 2.x).

---
 linden/indra/llmath/llrect.h                 | 4 ++--
 linden/indra/llplugin/llpluginclassmedia.cpp | 4 ++--
 linden/indra/llui/llpanel.cpp                | 2 +-
 linden/indra/llui/llview.cpp                 | 4 ++--
 linden/indra/newview/llviewerwindow.cpp      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/linden/indra/llmath/llrect.h b/linden/indra/llmath/llrect.h
index 9eb58db..33070c4 100644
--- a/linden/indra/llmath/llrect.h
+++ b/linden/indra/llmath/llrect.h
@@ -229,14 +229,14 @@ public:
 		return mLeft <= mRight && mBottom <= mTop;
 	}
 
-	bool isNull() const
+	bool isEmpty() const
 	{
 		return mLeft == mRight || mBottom == mTop;
 	}
 
 	bool notNull() const
 	{
-		return !isNull();
+		return !isEmpty();
 	}
 
 	LLRectBase& unionWith(const LLRectBase &other)
diff --git a/linden/indra/llplugin/llpluginclassmedia.cpp b/linden/indra/llplugin/llpluginclassmedia.cpp
index 9f14920..5dc0c47 100755
--- a/linden/indra/llplugin/llpluginclassmedia.cpp
+++ b/linden/indra/llplugin/llpluginclassmedia.cpp
@@ -393,7 +393,7 @@ bool LLPluginClassMedia::textureValid(void)
 
 bool LLPluginClassMedia::getDirty(LLRect *dirty_rect)
 {
-	bool result = !mDirtyRect.isNull();
+	bool result = !mDirtyRect.isEmpty();
 
 	if(dirty_rect != NULL)
 	{
@@ -793,7 +793,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
 					newDirtyRect.mBottom = temp;
 				}
 				
-				if(mDirtyRect.isNull())
+				if(mDirtyRect.isEmpty())
 				{
 					mDirtyRect = newDirtyRect;
 				}
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()
 
 		LLLocalClipRect clip(clip_rect);
 		// only force drawing invisible children if visible amount is non-zero
-		drawChild(panelp, 0, 0, !clip_rect.isNull());
+		drawChild(panelp, 0, 0, !clip_rect.isEmpty());
 	}
 }
 
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()
 
 			LLRect child_bounding_rect = childp->getBoundingRect();
 
-			if (local_bounding_rect.isNull())
+			if (local_bounding_rect.isEmpty())
 			{
 				// start out with bounding rect equal to first visible child's bounding rect
 				local_bounding_rect = child_bounding_rect;
@@ -1550,7 +1550,7 @@ void LLView::updateBoundingRect()
 			else
 			{
 				// accumulate non-null children rectangles
-				if (!child_bounding_rect.isNull())
+				if (!child_bounding_rect.isEmpty())
 				{
 					local_bounding_rect.unionWith(child_bounding_rect);
 				}
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index f4b738f..5cd730a 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -2817,7 +2817,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
 		// snap floaters to top of chat bar/button strip
 		LLView* chatbar_and_buttons = gOverlayBar->getChild<LLView>("chatbar_and_buttons", TRUE);
 		// find top of chatbar and state buttons, if either are visible
-		if (chatbar_and_buttons && !chatbar_and_buttons->getLocalBoundingRect().isNull())
+		if (chatbar_and_buttons && !chatbar_and_buttons->getLocalBoundingRect().isEmpty())
 		{
 			// convert top/left corner of chatbar/buttons container to gFloaterView-relative coordinates
 			S32 top, left;
-- 
cgit v1.1