From 6e3059ead528b73f6f99af48ae0607bbf1b156ef Mon Sep 17 00:00:00 2001
From: Hazim Gazov <hazim.gazov@gmail.com>
Date: Sat, 8 May 2010 23:01:21 -0300
Subject: [PATCH] fix crash when clicking disabled event poll button

---
 indra/newview/llfloatermessagelog.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloatermessagelog.cpp b/indra/newview/llfloatermessagelog.cpp
index cd570f0e9..859d2ec09 100644
--- a/indra/newview/llfloatermessagelog.cpp
+++ b/indra/newview/llfloatermessagelog.cpp
@@ -441,7 +441,13 @@ BOOL LLMessageLogFilterApply::tick()
 					LLFloaterMessageLog::sInstance->stopApplyingFilter();
 			return TRUE;
 		}
-		LLFloaterMessageLog::sInstance->conditionalLog(LLFloaterMessageLogItem((*mIter)));
+		try
+		{
+			LLFloaterMessageLog::sInstance->conditionalLog(LLFloaterMessageLogItem((*mIter)));
+		} catch (char *str)
+		{
+			llwarns << "DERPADERP" << llendl;
+		}
 		mIter++;
 		mProgress++;
 	}
@@ -619,6 +625,7 @@ void LLFloaterMessageLog::refreshNetList()
 		// Event queue isn't even supported yet... FIXME
 		LLScrollListIcon* icon = (LLScrollListIcon*)scroll_itemp->getColumn(3);
 		icon->setValue("icon_net_close_eventpoll_gray.tga");
+		icon->setClickCallback(NULL, NULL);
 	}
 	if(selected_id.notNull()) scrollp->selectByID(selected_id);
 	if(scroll_pos < scrollp->getItemCount()) scrollp->setScrollPos(scroll_pos);