From c5926546aa73bfb2900dda7d010a4d72550e6787 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 11 Aug 2009 17:47:40 -0700 Subject: Moved radar back into llfloatermap.cpp, it works --- linden/indra/newview/llfloatermap.h | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'linden/indra/newview/llfloatermap.h') diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h index dd1cba8..e099b4e 100644 --- a/linden/indra/newview/llfloatermap.h +++ b/linden/indra/newview/llfloatermap.h @@ -33,6 +33,7 @@ #define LL_LLFLOATERMAP_H #include "llfloater.h" +#include "llscrolllistctrl.h" class LLNetMap; @@ -46,6 +47,9 @@ public: static void* createPanelMiniMap(void* data); + static void updateRadar(); + static BOOL isSelected(LLUUID agent); + BOOL postBuild(); /*virtual*/ void draw(); @@ -55,7 +59,22 @@ public: private: LLFloaterMap(const LLSD& key = LLSD()); - LLNetMap* mPanelMap; + LLNetMap* mPanelMap; + LLScrollListCtrl* mRadarList; + LLUUID mSelectedAvatar; + static LLFloaterMap* sInstance; + + static void onList(class LLUICtrl* ctrl, void* user_data); + BOOL visibleItemsSelected() const; + void populateRadar(); + + static void onClickProfile(void* user_data); + static void onClickIM(void* user_data); + static void onClickAddFriend(void* user_data); + static void onClickOfferTeleport(void* user_data); + static void onClickTrack(void* user_data); + static void onClickInvite(void* user_data); + static void callback_invite_to_group(LLUUID group_id, void *user_data); }; #endif // LL_LLFLOATERMAP_H -- cgit v1.1 From d5dc47ac672165a19fff6e57c866eca6439ea7e0 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 12 Aug 2009 11:48:21 -0700 Subject: Fixed radar list scrolling issue, still missing toggle --- linden/indra/newview/llfloatermap.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'linden/indra/newview/llfloatermap.h') diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h index e099b4e..bcf6f0e 100644 --- a/linden/indra/newview/llfloatermap.h +++ b/linden/indra/newview/llfloatermap.h @@ -62,7 +62,12 @@ private: LLNetMap* mPanelMap; LLScrollListCtrl* mRadarList; LLUUID mSelectedAvatar; + std::vector mAvatarIDs; + std::vector mPositions; static LLFloaterMap* sInstance; + + void addToList(const LLUUID& agent_id, const LLVector3d& agent_pos, const LLVector3d& current_pos); + void removeFromList(const LLUUID& agent_id); static void onList(class LLUICtrl* ctrl, void* user_data); BOOL visibleItemsSelected() const; -- cgit v1.1 From b86a81bb6a425234238770c7ff997e92b94777f1 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Tue, 15 Sep 2009 23:44:25 -0700 Subject: Some code cleanup --- linden/indra/newview/llfloatermap.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'linden/indra/newview/llfloatermap.h') diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h index 0fff8a3..09fce01 100644 --- a/linden/indra/newview/llfloatermap.h +++ b/linden/indra/newview/llfloatermap.h @@ -48,7 +48,7 @@ public: static void* createPanelMiniMap(void* data); static void updateRadar(); - static BOOL isSelected(LLUUID agent); + static LLUUID getSelected(); BOOL postBuild(); @@ -69,7 +69,6 @@ private: LLUUID mSelectedAvatar; std::map mAvatars; bool mUpdate; - static LLFloaterMap* sInstance; static void onList(LLUICtrl* ctrl, void* user_data); static void onRangeChange(LLFocusableElement* focus, void* user_data); -- cgit v1.1 From 5de9994da14352081ac802404ef018265487e758 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 16 Sep 2009 06:15:37 -0700 Subject: More cleanup --- linden/indra/newview/llfloatermap.h | 1 - 1 file changed, 1 deletion(-) (limited to 'linden/indra/newview/llfloatermap.h') diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h index 09fce01..fae6184 100644 --- a/linden/indra/newview/llfloatermap.h +++ b/linden/indra/newview/llfloatermap.h @@ -67,7 +67,6 @@ private: LLNetMap* mPanelMap; LLScrollListCtrl* mRadarList; LLUUID mSelectedAvatar; - std::map mAvatars; bool mUpdate; static void onList(LLUICtrl* ctrl, void* user_data); -- cgit v1.1 From 34a125d95b422e9faf33ccecdae98ecd331cb068 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 16 Sep 2009 23:22:41 -0700 Subject: Estate and track buttons now disable when they should, tweaked spacing --- linden/indra/newview/llfloatermap.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'linden/indra/newview/llfloatermap.h') diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h index fae6184..81e4159 100644 --- a/linden/indra/newview/llfloatermap.h +++ b/linden/indra/newview/llfloatermap.h @@ -72,6 +72,7 @@ private: static void onList(LLUICtrl* ctrl, void* user_data); static void onRangeChange(LLFocusableElement* focus, void* user_data); BOOL visibleItemsSelected() const; + BOOL getKickable(const LLUUID &agent_id); void toggleButtons(); void populateRadar(); @@ -83,7 +84,7 @@ private: static void onClickInvite(void* user_data); static void callback_invite_to_group(LLUUID group_id, void *user_data); - static std::string getSelectedName(LLUUID agent_id); + static std::string getSelectedName(const LLUUID &agent_id); static void onClickFreeze(void *user_data); static void onClickEject(void *user_data); static void onClickMute(void *user_data); -- cgit v1.1