--- linden-orig\indra\newview\llnotify.cpp	2007-09-13 15:35:22.000000000 +0200
+++ linden\indra\newview\llnotify.cpp	2007-09-19 16:13:07.000000000 +0200
@@ -584,11 +584,14 @@
 		if (gNotifyBoxView->getChildCount() > 0)
 		{
 			LLNotifyBox* front = gNotifyBoxView->getFirstNontipBox();
-			gNotifyBoxView->showOnly(front);
-			// assuming that moveToBack is only called by clicking the next button,
-			// we give focus to the next next button
-			front->mNextBtn->setFocus(TRUE);
-			gFocusMgr.triggerFocusFlash(); // TODO: it's ugly to call this here
+			if (front) 
+			{
+				gNotifyBoxView->showOnly(front);
+				// assuming that moveToBack is only called by clicking the next button,
+				// we give focus to the next next button
+				front->mNextBtn->setFocus(TRUE);
+				gFocusMgr.triggerFocusFlash(); // TODO: it's ugly to call this here
+			}
 		}
 	}
 }
@@ -927,15 +930,18 @@
 
 LLNotifyBox * LLNotifyBoxView::getFirstNontipBox() const
 {
-	// assumes every child is a notify box
+	// childs are notify boxes and group-notifies
 	for(child_list_const_iter_t iter = getChildList()->begin();
 			iter != getChildList()->end();
 			iter++)
 	{
-		LLNotifyBox * box = static_cast<LLNotifyBox*>(*iter);
-		if(!box->isTip() && !box->isDead())
+		if ((*iter)->getName()!="groupnotify") 
 		{
-			return box;
+			LLNotifyBox * box = static_cast<LLNotifyBox*>(*iter);
+			if(!box->isTip() && !box->isDead())
+			{
+				return box;
+			}
 		}
 	}
 	return NULL;