summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.h
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-10-14 23:02:38 +0000
committerJames Cook <james@lindenlab.com>2009-10-14 23:02:38 +0000
commit8799193fde7e8af1128bb614f89a8de03b78ebd8 (patch)
treeda7e87eba24cdc669de64752b404c087eb77757b /indra/newview/llnetmap.h
parent69228f1197151bbf3e531290a7c78ae9110d087c (diff)
EXT-946 There is no terrain on the Mini-Map. Unclear if this fixes the problem or not, does not reliably repro for me. Found several uninitialized variables in LLNetMap and fixed those. Reviewed with Richard.
Diffstat (limited to 'indra/newview/llnetmap.h')
-rw-r--r--indra/newview/llnetmap.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h
index 821c348835..5ebdd13384 100644
--- a/indra/newview/llnetmap.h
+++ b/indra/newview/llnetmap.h
@@ -38,12 +38,17 @@
#include "v3math.h"
#include "v3dmath.h"
#include "v4color.h"
-#include "llimage.h"
+#include "llpointer.h"
class LLColor4U;
class LLCoordGL;
+class LLImageRaw;
class LLTextBox;
-class LLViewerTexture ;
+class LLViewerTexture;
+
+const F32 MAP_SCALE_MIN = 64.f;
+const F32 MAP_SCALE_MID = 172.f;
+const F32 MAP_SCALE_MAX = 512.f;
class LLNetMap : public LLUICtrl
{