Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shyotl
2012-12-16 13:30:29 -06:00
parent 6c9df4574c
commit 184882e916
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/lluictrl.h
View File

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

6
indra/newview/llfloaterworldmap.cpp
View File

@@ -899,12 +899,6 @@ void LLFloaterWorldMap::buildAvatarIDList()
list->operateOnSelection(LLCtrlListInterface::OP_DELETE); 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 // Get all of the calling cards for avatar that are currently online
LLCollectMappableBuddies collector; LLCollectMappableBuddies collector;
LLAvatarTracker::instance().applyFunctor(collector); LLAvatarTracker::instance().applyFunctor(collector);