diff options
author | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
commit | 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch) | |
tree | bcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/llworldmapview.h | |
parent | Second Life viewer sources 1.13.3.2 (diff) | |
download | meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2 meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz |
Second Life viewer sources 1.14.0.0
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llworldmapview.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h index 5c18aab..f2912bd 100644 --- a/linden/indra/newview/llworldmapview.h +++ b/linden/indra/newview/llworldmapview.h | |||
@@ -52,8 +52,9 @@ class LLTextBox; | |||
52 | #define SIM_MAP_AGENT_SCALE 20 // width in pixels, where we start drawing agents | 52 | #define SIM_MAP_AGENT_SCALE 20 // width in pixels, where we start drawing agents |
53 | #define SIM_MAP_SCALE 90 // width in pixels, where we start drawing sim tiles | 53 | #define SIM_MAP_SCALE 90 // width in pixels, where we start drawing sim tiles |
54 | 54 | ||
55 | // Updates for agent locations. | ||
55 | #define AGENTS_UPDATE_TIME 60.0 // in seconds | 56 | #define AGENTS_UPDATE_TIME 60.0 // in seconds |
56 | #define AGENT_COUNTS_UPDATE_TIME 60.0 // in seconds | 57 | |
57 | 58 | ||
58 | class LLWorldMapView : public LLPanel | 59 | class LLWorldMapView : public LLPanel |
59 | { | 60 | { |
@@ -65,12 +66,13 @@ public: | |||
65 | virtual ~LLWorldMapView(); | 66 | virtual ~LLWorldMapView(); |
66 | 67 | ||
67 | virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE ); | 68 | virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE ); |
69 | virtual void setVisible(BOOL visible); | ||
68 | 70 | ||
69 | virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); | 71 | virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); |
70 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); | 72 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); |
71 | virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask ); | 73 | virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask ); |
72 | virtual BOOL handleHover( S32 x, S32 y, MASK mask ); | 74 | virtual BOOL handleHover( S32 x, S32 y, MASK mask ); |
73 | /*virtual*/ BOOL handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen ); | 75 | virtual BOOL handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen ); |
74 | 76 | ||
75 | bool checkItemHit(S32 x, S32 y, LLItemInfo& item, LLUUID* id, bool track); | 77 | bool checkItemHit(S32 x, S32 y, LLItemInfo& item, LLUUID* id, bool track); |
76 | void handleClick(S32 x, S32 y, MASK mask, S32* hit_type, LLUUID* id); | 78 | void handleClick(S32 x, S32 y, MASK mask, S32* hit_type, LLUUID* id); |
@@ -183,7 +185,6 @@ public: | |||
183 | 185 | ||
184 | static BOOL sHandledLastClick; | 186 | static BOOL sHandledLastClick; |
185 | S32 mSelectIDStart; | 187 | S32 mSelectIDStart; |
186 | F64 mAgentCountsUpdateTime; | ||
187 | 188 | ||
188 | typedef std::vector<U64> handle_list_t; | 189 | typedef std::vector<U64> handle_list_t; |
189 | handle_list_t mVisibleRegions; // set every frame | 190 | handle_list_t mVisibleRegions; // set every frame |