3 files changed, 13 insertions, 0 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 004681325f..e1ee0a5b14 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -1093,6 +1093,11 @@ void LLView::drawChildren()
 		{
 			child_list_reverse_iter_t child = child_iter++;
 			LLView *viewp = *child;
+			
+			if (viewp == NULL)
+			{
+				continue;
+			}
 
 			if (viewp->getVisible() && viewp->getRect().isValid())
 			{
diff --git a/indra/llui/llwindowshade.cpp b/indra/llui/llwindowshade.cpp
index a8bb29374e..48a232c33e 100644
--- a/indra/llui/llwindowshade.cpp
+++ b/indra/llui/llwindowshade.cpp
@@ -371,6 +371,11 @@ void LLWindowShade::setTextColor(LLColor4 color)
 	getChild<LLTextBox>("notification_text")->setColor(color);
 }
 
+bool LLWindowShade::isShown() const
+{
+	return getChildRef<LLLayoutPanel>("notification_area").getVisible();
+}
+
 void LLWindowShade::setCanClose(bool can_close)
 {
 	getChildView("close_panel")->setVisible(can_close);
diff --git a/indra/llui/llwindowshade.h b/indra/llui/llwindowshade.h
index 1ae84028dd..6d753d1161 100644
--- a/indra/llui/llwindowshade.h
+++ b/indra/llui/llwindowshade.h
@@ -48,6 +48,9 @@ public:
 	void show(LLNotificationPtr);
 	/*virtual*/ void draw();
 	void hide();
+	
+	bool isShown() const;
+
 	void setBackgroundImage(LLUIImage* image);
 	void setTextColor(LLColor4 color);
 	void setCanClose(bool can_close);