diff options
Diffstat (limited to 'linden/indra/newview/llworldmapview.h')
-rw-r--r-- | linden/indra/newview/llworldmapview.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h index 9d7ce2b..32f2d6e 100644 --- a/linden/indra/newview/llworldmapview.h +++ b/linden/indra/newview/llworldmapview.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -52,13 +52,6 @@ class LLCoordGL; | |||
52 | class LLViewerImage; | 52 | class LLViewerImage; |
53 | class LLTextBox; | 53 | class LLTextBox; |
54 | 54 | ||
55 | #define SIM_NULL_MAP_SCALE 2 // width in pixels, where we start drawing "null" sims | ||
56 | #define SIM_MAP_AGENT_SCALE 20 // width in pixels, where we start drawing agents | ||
57 | #define SIM_MAP_SCALE 90 // width in pixels, where we start drawing sim tiles | ||
58 | |||
59 | // Updates for agent locations. | ||
60 | #define AGENTS_UPDATE_TIME 60.0 // in seconds | ||
61 | |||
62 | 55 | ||
63 | class LLWorldMapView : public LLPanel | 56 | class LLWorldMapView : public LLPanel |
64 | { | 57 | { |