4 files changed, 35 insertions, 9 deletions
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp
index 611d18d6d6..497354acc7 100644
--- a/indra/newview/llfacebookconnect.cpp
+++ b/indra/newview/llfacebookconnect.cpp
@@ -366,6 +366,30 @@ std::string LLFacebookConnect::getFacebookConnectURL(const std::string& route, b
 	return url;
 }
 
+std::string LLFacebookConnect::getFlickrConnectURL(const std::string& route, bool include_read_from_master)
+{
+	std::string url = gAgent.getRegion()->getCapability("FlickrConnect");
+	url += route;
+    
+	if (include_read_from_master && mReadFromMaster)
+	{
+		url += "?read_from_master=true";
+	}
+	return url;
+}
+
+std::string LLFacebookConnect::getTwitterConnectURL(const std::string& route, bool include_read_from_master)
+{
+	std::string url = gAgent.getRegion()->getCapability("TwitterConnect");
+	url += route;
+    
+	if (include_read_from_master && mReadFromMaster)
+	{
+		url += "?read_from_master=true";
+	}
+	return url;
+}
+
 void LLFacebookConnect::connectToFacebook(const std::string& auth_code, const std::string& auth_state)
 {
 	LLSD body;
@@ -388,6 +412,11 @@ void LLFacebookConnect::checkConnectionToFacebook(bool auto_connect)
 	const F32 timeout = HTTP_REQUEST_EXPIRY_SECS;
 	LLHTTPClient::get(getFacebookConnectURL("/connection", true), new LLFacebookConnectedResponder(auto_connect),
 						LLSD(), timeout, follow_redirects);
+	
+	// TEMPORARY FOR TESTING - CHO
+	llinfos << "FlickrConnect URL: " << getFlickrConnectURL() << LL_ENDL;
+	llinfos << "TwitterConnect URL: " << getTwitterConnectURL() << LL_ENDL;
+
 }
 
 void LLFacebookConnect::loadFacebookInfo()
diff --git a/indra/newview/llfacebookconnect.h b/indra/newview/llfacebookconnect.h
index a77ac24167..c4117174c1 100644
--- a/indra/newview/llfacebookconnect.h
+++ b/indra/newview/llfacebookconnect.h
@@ -89,6 +89,10 @@ private:
 	LLFacebookConnect();
 	~LLFacebookConnect() {};
  	std::string getFacebookConnectURL(const std::string& route = "", bool include_read_from_master = false);
+
+	// TEMPORARY FOR TESTING - CHO
+ 	std::string getFlickrConnectURL(const std::string& route = "", bool include_read_from_master = false);
+ 	std::string getTwitterConnectURL(const std::string& route = "", bool include_read_from_master = false);
    
     EConnectionState mConnectionState;
 	BOOL mConnected;
diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index 9d703d2752..5c569b9bf0 100755
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -253,11 +253,6 @@ void LLFloaterWebContent::open_media(const Params& p)
 	getChildView("address")->setEnabled(address_entry_enabled);
 	getChildView("popexternal")->setEnabled(address_entry_enabled);
 
-	if (!address_entry_enabled)
-	{
-		mWebBrowser->setFocus(TRUE);
-	}
-
 	if (!p.show_chrome)
 	{
 		setResizeLimits(100, 100);
@@ -434,9 +429,6 @@ void LLFloaterWebContent::set_current_url(const std::string& url)
         mAddressCombo->remove(mCurrentURL);
         mAddressCombo->add(mDisplayURL);
         mAddressCombo->selectByValue(mDisplayURL);
-
-        // Set the focus back to the web page. When setting the url, there's no point to leave the focus anywhere else.
-		mWebBrowser->setFocus(TRUE);
     }
 }
 
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 460f9084d9..02402fa876 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1596,7 +1596,8 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("EstateChangeInfo");
 	capabilityNames.append("EventQueueGet");
 	capabilityNames.append("FacebookConnect");
-	//capabilityNames.append("FacebookRedirect");
+	capabilityNames.append("FlickrConnect");
+	capabilityNames.append("TwitterConnect");
 
 	if (gSavedSettings.getBOOL("UseHTTPInventory"))
 	{