aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llnetmap.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-08-11 17:47:40 -0700
committerMcCabe Maxsted2009-08-11 17:47:40 -0700
commitc5926546aa73bfb2900dda7d010a4d72550e6787 (patch)
treec8d48cacdd56f4b8fc191f0c75cff5446b020617 /linden/indra/newview/llnetmap.h
parentChanged range to 96m (diff)
downloadmeta-impy-c5926546aa73bfb2900dda7d010a4d72550e6787.zip
meta-impy-c5926546aa73bfb2900dda7d010a4d72550e6787.tar.gz
meta-impy-c5926546aa73bfb2900dda7d010a4d72550e6787.tar.bz2
meta-impy-c5926546aa73bfb2900dda7d010a4d72550e6787.tar.xz
Moved radar back into llfloatermap.cpp, it works
Diffstat (limited to 'linden/indra/newview/llnetmap.h')
-rw-r--r--linden/indra/newview/llnetmap.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index 58b2066..45b5e2d 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -34,7 +34,6 @@
34 34
35#include "llpanel.h" 35#include "llpanel.h"
36#include "llmemberlistener.h" 36#include "llmemberlistener.h"
37#include "llscrolllistctrl.h"
38#include "v3math.h" 37#include "v3math.h"
39#include "v3dmath.h" 38#include "v3dmath.h"
40#include "v4color.h" 39#include "v4color.h"
@@ -116,7 +115,6 @@ private:
116private: 115private:
117 LLUUID mClosestAgentToCursor; 116 LLUUID mClosestAgentToCursor;
118 LLUUID mClosestAgentAtLastRightClick; 117 LLUUID mClosestAgentAtLastRightClick;
119 LLScrollListCtrl* mRadarList;
120 118
121 static BOOL sRotateMap; 119 static BOOL sRotateMap;
122 static LLNetMap* sInstance; 120 static LLNetMap* sInstance;
@@ -126,16 +124,6 @@ private:
126 static void showAgentProfile(void*); 124 static void showAgentProfile(void*);
127 BOOL isAgentUnderCursor() { return mClosestAgentToCursor.notNull(); } 125 BOOL isAgentUnderCursor() { return mClosestAgentToCursor.notNull(); }
128 126
129 void populateRadar();
130
131 static void onClickProfile(void* user_data);
132 static void onClickIM(void* user_data);
133 static void onClickAddFriend(void* user_data);
134 static void onClickOfferTeleport(void* user_data);
135 static void onClickTrack(void* user_data);
136 static void onClickInvite(void* user_data);
137 static void callback_invite_to_group(LLUUID group_id, void *user_data);
138
139 class LLScaleMap : public LLMemberListener<LLNetMap> 127 class LLScaleMap : public LLMemberListener<LLNetMap>
140 { 128 {
141 public: 129 public: