5 files changed, 1 insertions, 8 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 488cfcf..4d53c88 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -248,7 +248,6 @@ BOOL				gDisconnected = FALSE;
 
 // Map scale in pixels per region
 F32                             gMapScale = 128.f;
-F32                             gMiniMapScale = 128.f;
 
 // used to restore texture state after a mode switch
 LLFrameTimer    gRestoreGLTimer;
@@ -406,7 +405,6 @@ static void settings_to_globals()
         gAllowTapTapHoldRun = gSavedSettings.getBOOL("AllowTapTapHoldRun");
         gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
         gMapScale = gSavedSettings.getF32("MapScale");
-        gMiniMapScale = gSavedSettings.getF32("MiniMapScale");
         LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
 
         LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
@@ -2181,7 +2179,6 @@ void LLAppViewer::cleanupSavedSettings()
         }
 
         gSavedSettings.setF32("MapScale", gMapScale );
-        gSavedSettings.setF32("MiniMapScale", gMiniMapScale );
         gSavedSettings.setBOOL("ShowHoverTips", LLHoverView::sShowHoverTips);
 
         // Some things are cached in LLAgent.
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 9583982..3be5de7 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -294,7 +294,6 @@ extern BOOL		gDisconnected;
 
 // Map scale in pixels per region
 extern F32 gMapScale;
-extern F32 gMiniMapScale;
 
 extern LLFrameTimer     gRestoreGLTimer;
 extern BOOL                     gRestoreGL;
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 7e9632d..d2fcf01 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -64,7 +64,6 @@
 #include "llviewerregion.h"
 #include "llcombobox.h"
 #include "lltooldraganddrop.h"
-#include "llfloatermap.h"
 #include "lluiconstants.h"
 #include "lluploaddialog.h"
 #include "llcallingcard.h"
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 35982c8..9c607e0 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -74,6 +74,7 @@ const F32 MAP_SCALE_MAX = 512;
 const F32 MAP_SCALE_INCREMENT = 16;
 const F32 MAP_MIN_PICK_DIST = 4;
 const F32 MAP_MINOR_DIR_THRESHOLD = 0.08f;
+const S32 SLOP = 2;
 
 const S32 TRACKING_RADIUS = 3;
 
@@ -800,7 +801,6 @@ BOOL LLNetMap::outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y)
 {
         S32 dx = x - start_x;
         S32 dy = y - start_y;
-        S32 SLOP = 4;
 
         return (dx <= -SLOP || SLOP <= dx || dy <= -SLOP || SLOP <= dy);
 }
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 9aa44fc..3fb8e9a 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -80,7 +80,6 @@
 #include "llfloaterland.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterlandholdings.h"
-#include "llfloatermap.h"
 #include "llurldispatcher.h"
 #include "llfloatermute.h"
 #include "llfloaterpostcard.h"
@@ -95,7 +94,6 @@
 #include "llinventoryview.h"
 #include "llmenugl.h"
 #include "llmutelist.h"
-#include "llnetmap.h"
 #include "llnotify.h"
 #include "llpanelgrouplandmoney.h"
 #include "llselectmgr.h"