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: [PATCH] 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/llfloatermap.cpp | 8 --------
indra/newview/llnetmap.cpp | 27 ++++++++++++++++++---------
indra/newview/llnetmap.h | 9 +++++++--
3 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
index eac1b65f7d1..0c9a759f320 100644
--- a/indra/newview/llfloatermap.cpp
+++ b/indra/newview/llfloatermap.cpp
@@ -30,7 +30,6 @@
* $/LicenseInfo$
*/
-#include <string>
#include "llviewerprecompiledheaders.h"
// self include
@@ -51,13 +50,6 @@
#include "lltextbox.h"
#include "llviewermenu.h"
-//
-// Constants
-//
-const F32 MAP_SCALE_MIN = 64;
-const F32 MAP_SCALE_MID = 172;
-const F32 MAP_SCALE_MAX = 512;
-
//
// Member functions
//
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index bd6e6cd0cba..b6b433c28f1 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -65,21 +65,30 @@
static LLDefaultChildRegistry::Register<LLNetMap> r1("net_map");
-const F32 MAP_SCALE_MIN = 64;
-const F32 MAP_SCALE_MID = 172;
-const F32 MAP_SCALE_MAX = 512;
const F32 MAP_SCALE_INCREMENT = 16;
const F32 MAP_MIN_PICK_DIST = 4;
const F32 MAX_PRIM_RADIUS = 256.0f; // Don't try to draw giant mega-prims on the mini map
-LLNetMap::LLNetMap (const Params & p) :
- LLUICtrl (p),
- mScale(128.0f),
+LLNetMap::LLNetMap (const Params & p)
+: LLUICtrl (p),
mBackgroundColor (p.bg_color()),
- mRotateMap(FALSE)
+ mScale( MAP_SCALE_MID ),
+ mPixelsPerMeter( MAP_SCALE_MID / REGION_WIDTH_METERS ),
+ mObjectMapTPM(0.f),
+ mObjectMapPixels(0.f),
+ mTargetPanX(0.f),
+ mTargetPanY(0.f),
+ mCurPanX(0.f),
+ mCurPanY(0.f),
+ mUpdateNow(FALSE),
+ mObjectImageCenterGlobal( gAgent.getCameraPositionGlobal() ),
+ mObjectRawImagep(),
+ mObjectImagep(),
+ mClosestAgentToCursor(),
+ mClosestAgentAtLastRightClick(),
+ mRotateMap(FALSE),
+ mToolTipMsg()
{
- mObjectImageCenterGlobal = gAgent.getCameraPositionGlobal();
- mPixelsPerMeter = mScale / REGION_WIDTH_METERS;
}
LLNetMap::~LLNetMap()
diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h
index 821c348835b..5ebdd133846 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
{
--
GitLab