From 2051ba7248f11af083bbda9cd8b67be99d0d844b Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Fri, 30 Jul 2010 11:19:28 +0100
Subject: remove a nonsense assert that gcc was choking on.

---
 indra/newview/llnearbychatbar.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra/newview/llnearbychatbar.cpp')

diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 8a52cf715f..6cfd810c10 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -393,10 +393,8 @@ LLGestureComboList::~LLGestureComboList()
 
 LLCtrlListInterface* LLGestureComboList::getListInterface()
 {
-	LLCtrlListInterface *result = mList;
-	llassert((LLCtrlListInterface*)mList==result);
 	return mList;
-};
+}
 
 LLNearbyChatBar::LLNearbyChatBar() 
 	: LLPanel()
-- 
cgit v1.2.3


From 90e3d83a5cb35e98a02a3017dd79ebc272bbfe85 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 21 Sep 2010 13:26:52 -0400
Subject: Fix for build failures - disabling tcmalloc for now

---
 indra/newview/llnearbychatbar.cpp | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/llnearbychatbar.cpp

(limited to 'indra/newview/llnearbychatbar.cpp')

diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
old mode 100644
new mode 100755
-- 
cgit v1.2.3