aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatermap.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-10-04 09:12:16 -0700
committerMcCabe Maxsted2009-10-04 14:02:02 -0700
commitb5f977a6b3757aa785346d20a8f7b29858506d42 (patch)
treeec7bc3f7a01d1cda43ff5d9f0e614f7ba02b2b05 /linden/indra/newview/llfloatermap.h
parentFixed layout of debug permissions in tools window (diff)
downloadmeta-impy-b5f977a6b3757aa785346d20a8f7b29858506d42.zip
meta-impy-b5f977a6b3757aa785346d20a8f7b29858506d42.tar.gz
meta-impy-b5f977a6b3757aa785346d20a8f7b29858506d42.tar.bz2
meta-impy-b5f977a6b3757aa785346d20a8f7b29858506d42.tar.xz
Mini-map radar now notifies when someone enters chat range, and how far away they are
Diffstat (limited to 'linden/indra/newview/llfloatermap.h')
-rw-r--r--linden/indra/newview/llfloatermap.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index 349b0e6..deb972b 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -66,10 +66,11 @@ public:
66private: 66private:
67 LLFloaterMap(const LLSD& key = LLSD()); 67 LLFloaterMap(const LLSD& key = LLSD());
68 68
69 LLNetMap* mPanelMap; 69 LLNetMap* mPanelMap;
70 LLScrollListCtrl* mRadarList; 70 LLScrollListCtrl* mRadarList;
71 LLUUID mSelectedAvatar; 71 LLUUID mSelectedAvatar;
72 bool mUpdate; 72 std::set<LLUUID> mChatAvatars;
73 bool mUpdate;
73 74
74 static void onList(LLUICtrl* ctrl, void* user_data); 75 static void onList(LLUICtrl* ctrl, void* user_data);
75 static void onRangeChange(LLFocusableElement* focus, void* user_data); 76 static void onRangeChange(LLFocusableElement* focus, void* user_data);
@@ -78,6 +79,11 @@ private:
78 void toggleButtons(); 79 void toggleButtons();
79 void populateRadar(); 80 void populateRadar();
80 81
82 void updateChatList(std::vector<LLUUID> agent_ids);
83 bool getInChatList(LLUUID agent_id);
84 void addToChatList(LLUUID agent_id, std::string distance);
85 void removeFromChatList(LLUUID agent_id);
86
81 static void onClickProfile(void* user_data); 87 static void onClickProfile(void* user_data);
82 static void onClickIM(void* user_data); 88 static void onClickIM(void* user_data);
83 static void onClickAddFriend(void* user_data); 89 static void onClickAddFriend(void* user_data);