Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer

Conflicts:
	indra/newview/skins/default/xui/en-us/strings.xml

indra/newview/llstartup.cpp

@@ -1095,12 +1095,14 @@ bool idle_startup()
 			// END TODO
 			LLPanelLogin::close();
 		}
-		
+
 		//For HTML parsing in text boxes.
 		LLTextEditor::setLinkColor( gSavedSettings.getColor4("HTMLLinkColor") );
 
 		// Load URL History File
 		LLURLHistory::loadFile("url_history.xml");
+		// Load media plugin cookies
+		LLViewerMedia::loadCookieFile();
 				
 		//-------------------------------------------------
 		// Handle startup progress screen
@@ -4309,7 +4311,6 @@ bool process_login_success_response(std::string& password)
 #endif
 	}
 
-	
 	// Override grid info with anything sent in the login response
 	std::string tmp = response["gridname"].asString();
 	if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setGridName(tmp);
@@ -4354,6 +4355,14 @@ bool process_login_success_response(std::string& password)
 	gHippoGridManager->saveFile();
 	gHippoLimits->setLimits();
 
+	// Start the process of fetching the OpenID session cookie for this user login
+	std::string openid_url = response["openid_url"];
+	if(!openid_url.empty())
+	{
+		std::string openid_token = response["openid_token"];
+		LLViewerMedia::openIDSetup(openid_url, openid_token);
+	}
+
 	gIMMgr->loadIgnoreGroup();
 
 	bool success = false;