EXT-3778 Fixed handling of url passed in on cmd line.

The url from the cmd line was being overridden by the LoginLocation setting. (my bad!)
Removed unnecessary llurlsimstring.h includes.

indra/newview/llmediactrl.cpp

@@ -39,7 +39,6 @@
 #include "llfloaterworldmap.h"
 #include "lluictrlfactory.h"
 #include "llurldispatcher.h"
-#include "llurlsimstring.h"
 #include "llviewborder.h"
 #include "llviewercontrol.h"
 #include "llviewermedia.h"

indra/newview/llpanellogin.cpp

@@ -62,7 +62,6 @@
 #include "llviewermenu.h"			// for handle_preferences()
 #include "llviewernetwork.h"
 #include "llviewerwindow.h"			// to link into child list
-#include "llurlsimstring.h"
 #include "lluictrlfactory.h"
 #include "llhttpclient.h"
 #include "llweb.h"
@@ -229,8 +228,12 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
 	LLComboBox* combo = getChild<LLComboBox>("start_location_combo");
 
-	LLURLSimString::setString(gSavedSettings.getString("LoginLocation"));
 	std::string sim_string = LLURLSimString::sInstance.mSimString;
+	if(sim_string.empty())
+	{
+		LLURLSimString::setString(gSavedSettings.getString("LoginLocation"));
+	}
+
 	if (!sim_string.empty())
 	{
 		// Replace "<Type region name>" with this region name

indra/newview/llteleporthistory.cpp

@@ -39,7 +39,6 @@
 
 #include "llagent.h"
 #include "llslurl.h"
-#include "llurlsimstring.h"
 #include "llviewercontrol.h"        // for gSavedSettings
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"

indra/newview/llviewerwindow.cpp

@@ -182,7 +182,6 @@
 #include "llworldmapview.h"
 #include "pipeline.h"
 #include "llappviewer.h"
-#include "llurlsimstring.h"
 #include "llviewerdisplay.h"
 #include "llspatialpartition.h"
 #include "llviewerjoystick.h"