From 5969412f5e9342955c79b57a10d3d6f987a06d1c Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 29 Oct 2009 02:03:04 -0500 Subject: Added PanelRadar class, refactored from LLFloaterMap. --- linden/indra/newview/llfloatermap.h | 78 +++++-------------------------------- 1 file changed, 10 insertions(+), 68 deletions(-) (limited to 'linden/indra/newview/llfloatermap.h') diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h index aedbcb8..7cde970 100644 --- a/linden/indra/newview/llfloatermap.h +++ b/linden/indra/newview/llfloatermap.h @@ -33,7 +33,7 @@ #define LL_LLFLOATERMAP_H #include "llfloater.h" -#include "llscrolllistctrl.h" +#include "panelradar.h" class LLNetMap; @@ -46,85 +46,27 @@ public: virtual ~LLFloaterMap(); static void* createPanelMiniMap(void* data); - - static void updateRadar(); - static LLUUID getSelected(); - // returns true if agent_id belongs to a developer listed in llfloatermap.cpp - static bool isImpDev(LLUUID agent_id); - - bool isTyping(LLUUID agent_id); - void updateTypingList(LLUUID agent_id, bool remove); + static void* createPanelRadar(void* data); BOOL postBuild(); - /*virtual*/ void draw(); - /*virtual*/ void onOpen(); - /*virtual*/ void onClose(bool app_quitting); - /*virtual*/ BOOL canClose(); + /*virtual*/ void draw(); + /*virtual*/ void onOpen(); + /*virtual*/ void onClose(bool app_quitting); + /*virtual*/ BOOL canClose(); // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-05 (RLVa-1.0.0c) - /*virtual*/ void open(); + /*virtual*/ void open(); // [/RLVa:KB] + PanelRadar* getRadar(); private: LLFloaterMap(const LLSD& key = LLSD()); - LLNetMap* mPanelMap; - LLScrollListCtrl* mRadarList; - LLUUID mSelectedAvatar; - - // TODO: move all this info into its own object. It's stupid - // and bug-prone to keep it all in separate containers, but - // I want to get this out for 1.2 -- McCabe - std::set mChatAvatars; - std::set mTypingAvatars; - std::set mSimAvatars; - bool mUpdate; - - static void onList(LLUICtrl* ctrl, void* user_data); - static void onRangeChange(LLFocusableElement* focus, void* user_data); - BOOL visibleItemsSelected() const; - BOOL isKickable(const LLUUID &agent_id); - void toggleButtons(); - void populateRadar(); - - void updateChatList(std::vector agent_ids); - bool isInChatList(LLUUID agent_id); - void addToChatList(LLUUID agent_id, std::string distance); - void removeFromChatList(LLUUID agent_id); - - bool getInSimAvList(LLUUID agent_id); - void addToSimAvList(LLUUID agent_id, std::string distance); - void updateSimAvList(std::vector agent_ids); - - 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); - - 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); - static void onClickUnmute(void *user_data); - static void onClickAR(void *user_data); - static void onClickEjectFromEstate(void *user_data); - - static void callbackFreeze(S32 option, void *user_data); - static void callbackEject(S32 option, void *user_data); - static void callbackAR(void *user_data); - static void callbackEjectFromEstate(S32 option, void *user_data); + LLNetMap* mPanelMap; + PanelRadar* mPanelRadar; - static void sendFreeze(const LLUUID &avatar, bool); - static void sendEject(const LLUUID &avatar, bool); - static void cmdEstateEject(const LLUUID &avatar); - static void cmdEstateBan(const LLUUID &avatar); - static void sendEstateBan(const LLUUID& agent); - static void sendEstateMessage(const char* request, const LLUUID &target); }; #endif // LL_LLFLOATERMAP_H -- cgit v1.1