From 184882e9160db2f743b5c8b61af25e12ff431257 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sun, 16 Dec 2012 13:30:29 -0600 Subject: [PATCH] Remove dead code from llfloaterworldmap, and a tweak to lluictrl that I could've sworn I already did. --- indra/llui/lluictrl.h | 4 +++- indra/newview/llfloaterworldmap.cpp | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index 0a988c7a7..69841a042 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -37,11 +37,13 @@ #include "llview.h" #include "llrect.h" #include "llsd.h" +#include +#include #include "llviewmodel.h" // *TODO move dependency to .cpp file class LLUICtrl -: public LLView +: public LLView, public boost::signals2::trackable { public: typedef boost::function commit_callback_t; diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index f21bb2902..0cd3906fb 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/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);