aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llnetmap.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llnetmap.h')
-rw-r--r--linden/indra/newview/llnetmap.h21
1 files changed, 18 insertions, 3 deletions
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index 4202e24..c0c19d5 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -53,6 +53,8 @@ class LLNetMap : public LLPanel
53{ 53{
54public: 54public:
55 LLNetMap(const std::string& name); 55 LLNetMap(const std::string& name);
56
57 virtual BOOL postBuild();
56 virtual ~LLNetMap(); 58 virtual ~LLNetMap();
57 59
58 virtual void draw(); 60 virtual void draw();
@@ -94,7 +96,8 @@ private:
94 F32 mScale; // Size of a region in pixels 96 F32 mScale; // Size of a region in pixels
95 F32 mPixelsPerMeter; // world meters to map pixels 97 F32 mPixelsPerMeter; // world meters to map pixels
96 F32 mObjectMapTPM; // texels per meter on map 98 F32 mObjectMapTPM; // texels per meter on map
97 F32 mObjectMapPixels; // Width of object map in pixels; 99 F32 mObjectMapPixels; // Width of object map in pixels
100 F32 mDotRadius; // Size of avatar markers
98 F32 mTargetPanX; 101 F32 mTargetPanX;
99 F32 mTargetPanY; 102 F32 mTargetPanY;
100 F32 mCurPanX; 103 F32 mCurPanX;
@@ -112,8 +115,8 @@ private:
112 LLPointer<LLImageGL> mObjectImagep; 115 LLPointer<LLImageGL> mObjectImagep;
113 116
114private: 117private:
115 LLUUID mClosestAgentToCursor; 118 LLUUID mClosestAgentToCursor;
116 LLUUID mClosestAgentAtLastRightClick; 119 LLUUID mClosestAgentAtLastRightClick;
117 120
118 static BOOL sRotateMap; 121 static BOOL sRotateMap;
119 static LLNetMap* sInstance; 122 static LLNetMap* sInstance;
@@ -141,6 +144,18 @@ private:
141 /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata); 144 /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
142 }; 145 };
143 146
147 class LLRotateMap : public LLMemberListener<LLNetMap>
148 {
149 public:
150 /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
151 };
152
153 class LLCheckRotateMap : public LLMemberListener<LLNetMap>
154 {
155 public:
156 /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
157 };
158
144 class LLShowWorldMap : public LLMemberListener<LLNetMap> 159 class LLShowWorldMap : public LLMemberListener<LLNetMap>
145 { 160 {
146 public: 161 public: