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