From 2a2930d24559c4d33470099807ade5f29d460210 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Tue, 4 May 2010 10:37:32 -0700 Subject: DEV-45807 - worldmap doesn't work against non maingrid servers The code used to retrieve the tiles for the world map was hardcoded to retrieve the map tiles via s3. However, non-maingrid servers do not necessarily publish their map tiles to s3. The URL was in the form http://map.secondlife.com.s3.amazonaws.com/map----objects.jpg This change removes the hard coding and places the default s3 URL in the settings.xml file via MapServerURL. Login retrieves the specific grids URL via a map-server-url option. The url is still expected to contain jpegs named like map----objects.jpg CR: Karina Linden --- indra/newview/lllogininstance.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/lllogininstance.cpp') diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index 848cc8ec93..71604291e1 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -151,6 +151,7 @@ void LLLoginInstance::constructAuthParams(LLPointer user_credentia requested_options.append("newuser-config"); requested_options.append("ui-config"); #endif + requested_options.append("map-server-url"); requested_options.append("voice-config"); requested_options.append("tutorial_setting"); requested_options.append("login-flags"); -- cgit v1.2.3