1 files changed, 11 insertions, 1 deletions

diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index 6e44a1e..af4d1cc 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -67,13 +67,19 @@ public:
 
 
 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<LLUUID>                mChatAvatars;
-        std::set<LLUUID>                mTypingAvatars; 
+        std::set<LLUUID>                mTypingAvatars;
+        std::set<LLUUID>                mSimAvatars;
         bool                                    mUpdate;
         
         static void onList(LLUICtrl* ctrl, void* user_data);
@@ -88,6 +94,10 @@ private:
         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<LLUUID> agent_ids);
+
         static void onClickProfile(void* user_data);
         static void onClickIM(void* user_data);
         static void onClickAddFriend(void* user_data);