Opensim map tile support

indra/newview/llstartup.cpp

@@ -3444,6 +3444,8 @@ bool process_login_success_response(U32& first_sim_size_x, U32& first_sim_size_y
 	{
 		// agent_access can be 'A', 'M', and 'PG'.
 		gAgent.setMaturity(text[0]);
+		U32 preferredMaturity = (U32)LLAgent::convertTextToMaturity(text[0]);
+		gSavedSettings.setU32("PreferredMaturity", preferredMaturity);
 	}
 	
 	// this is the value of their preference setting for that content

indra/newview/llworldmipmap.cpp

@@ -27,7 +27,9 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llworldmipmap.h"
+#include "llagent.h"
 #include "llviewercontrol.h"		// LLControlGroup
+#include "llviewerregion.h"
 
 #include "llviewertexturelist.h"
 #include "math.h"	// log()
@@ -181,7 +183,9 @@ LLPointer<LLViewerFetchedTexture> LLWorldMipmap::getObjectsTile(U32 grid_x, U32
 LLPointer<LLViewerFetchedTexture> LLWorldMipmap::loadObjectsTile(U32 grid_x, U32 grid_y, S32 level)
 {
 	// Get the grid coordinates
-	std::string imageurl = gSavedSettings.getString("CurrentMapServerURL") + llformat("map-%d-%d-%d-objects.jpg", level, grid_x, grid_y);
+	LLViewerRegion* regionp = gAgent.getRegion();
+	std::string imageurl = regionp != nullptr ? regionp->getMapServerURL() : gSavedSettings.getString("CurrentMapServerURL");
+	imageurl.append(llformat("map-%d-%d-%d-objects.jpg", level, grid_x, grid_y));
 
 	// DO NOT COMMIT!! DEBUG ONLY!!!
 	// Use a local jpeg for every tile to test map speed without S3 access