From 3c36214993ea0971fa167629a997fe2cda2a2049 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 13 Sep 2010 20:47:57 +0200
Subject: Henri Beauchamp: use http map if possible. Fixes broken map in SL +
http map possible for OS
---
linden/indra/newview/app_settings/settings.xml | 22 ++++++++
linden/indra/newview/llfloaterworldmap.cpp | 4 +-
linden/indra/newview/llfloaterworldmap.h | 9 +---
linden/indra/newview/llmapresponders.cpp | 29 ++++++++---
linden/indra/newview/llmapresponders.h | 2 +-
linden/indra/newview/llstartup.cpp | 11 +++-
linden/indra/newview/llviewermenu.cpp | 3 ++
linden/indra/newview/llworldmap.cpp | 60 +++++++++++++++++++---
linden/indra/newview/llworldmap.h | 8 +++
linden/indra/newview/llworldmapview.cpp | 70 +++++++++++++++-----------
linden/indra/newview/llworldmapview.h | 7 ++-
11 files changed, 169 insertions(+), 56 deletions(-)
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index ca44a2f..acdb0a6 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -6912,6 +6912,28 @@
Value
20.0
+ MapServerURL
+
+ UseWebMapTiles
+
MapOverlayIndex