From 8799193fde7e8af1128bb614f89a8de03b78ebd8 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 14 Oct 2009 23:02:38 +0000
Subject: 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.

---
 indra/newview/llnetmap.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llnetmap.h')

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
 {
-- 
cgit v1.2.3