Remove dead code from llfloaterworldmap, and a tweak to lluictrl that I could've sworn I already did.

indra/llui/lluictrl.h

@@ -37,11 +37,13 @@
 #include "llview.h"
 #include "llrect.h"
 #include "llsd.h"
+#include <boost/function.hpp>
+#include <boost/signals2.hpp>
 
 #include "llviewmodel.h"		// *TODO move dependency to .cpp file
 
 class LLUICtrl
-: public LLView 
+: public LLView, public boost::signals2::trackable
 {
 public:
 	typedef boost::function<void (LLUICtrl* ctrl, const LLSD& param)> commit_callback_t;

indra/newview/llfloaterworldmap.cpp

@@ -899,12 +899,6 @@ void LLFloaterWorldMap::buildAvatarIDList()
 		list->operateOnSelection(LLCtrlListInterface::OP_DELETE);
 	}
 
-	LLSD default_column;
-	default_column["name"] = "friend name";
-	default_column["label"] = "Friend Name";
-	default_column["width"] = 500;
-	list->addColumn(default_column);
-
 	// Get all of the calling cards for avatar that are currently online
 	LLCollectMappableBuddies collector;
 	LLAvatarTracker::instance().applyFunctor(collector);