diff --git a/indra/newview/llflickrconnect.cpp b/indra/newview/llflickrconnect.cpp
index 3da3ef22b2c43c7ccdb9b9906a0565f9201afe86..3a21933b6359d48e25df71ca7fc45bf01130221b 100644
--- a/indra/newview/llflickrconnect.cpp
+++ b/indra/newview/llflickrconnect.cpp
@@ -296,8 +296,8 @@ std::string LLFlickrConnect::getFlickrConnectURL(const std::string& route, bool
     LLViewerRegion *regionp = gAgent.getRegion();
     if (regionp)
     {
-		url = "http://pdp15.lindenlab.com/flickr/agent/" + gAgentID.asString(); // TEMPORARY FOR TESTING - CHO
-        //url = regionp->getCapability("FlickrConnect");
+		//url = "http://pdp15.lindenlab.com/flickr/agent/" + gAgentID.asString(); // TEMPORARY FOR TESTING - CHO
+        url = regionp->getCapability("FlickrConnect");
         url += route;
     
         if (include_read_from_master && mReadFromMaster)
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp
index 7140b527b924c3f09becc8a522a060224d356aa6..0bfbd02a04534cc6ac66bceb993d3b5c7469f33a 100644
--- a/indra/newview/llfloaterflickr.cpp
+++ b/indra/newview/llfloaterflickr.cpp
@@ -261,11 +261,13 @@ void LLFlickrPhotoPanel::sendPhoto()
 		// Add query parameters so Google Analytics can track incoming clicks!
 		slurl_string += DEFAULT_PHOTO_QUERY_PARAMETERS;
 
+		slurl_string = "<a href=\"" + slurl_string + "\">VISIT THIS LOCATION</a>";
+
 		// Add it to the description (pretty crude, but we don't have a better option with photos)
 		if (description.empty())
 			description = slurl_string;
 		else
-			description = description + " " + slurl_string;
+			description = description + "\n\n" + slurl_string;
 	}
 
 	// Get the content rating
diff --git a/indra/newview/llfloatertwitter.cpp b/indra/newview/llfloatertwitter.cpp
index 46cad7ec4508da21e14843ef8dc1ed5cb0e3e902..6f8ad109c6c02fdc0860318701052118ae5551fe 100644
--- a/indra/newview/llfloatertwitter.cpp
+++ b/indra/newview/llfloatertwitter.cpp
@@ -117,7 +117,7 @@ void LLTwitterPhotoPanel::draw()
 	LLTextEditor* status_text_box = dynamic_cast<LLTextEditor*>(mStatusTextBox);
 	if (status_text_box)
 	{
-		int max_status_length = add_photo ? 119 : 140;
+		int max_status_length = add_photo ? 100 : 140;
 		status_text_box->setMaxTextLength(max_status_length);
 		if (status_text_box->getText().length() > max_status_length)
 		{
diff --git a/indra/newview/lltwitterconnect.cpp b/indra/newview/lltwitterconnect.cpp
index fe45d3e4d0f740ff1878588a7ecbce409cda445b..e015867df2b2ca1e2add87428b83cbbb8e24b86d 100644
--- a/indra/newview/lltwitterconnect.cpp
+++ b/indra/newview/lltwitterconnect.cpp
@@ -296,8 +296,8 @@ std::string LLTwitterConnect::getTwitterConnectURL(const std::string& route, boo
     LLViewerRegion *regionp = gAgent.getRegion();
     if (regionp)
     {
-		url = "http://pdp15.lindenlab.com/twitter/agent/" + gAgentID.asString(); // TEMPORARY FOR TESTING - CHO
-        //url = regionp->getCapability("TwitterConnect");
+		//url = "http://pdp15.lindenlab.com/twitter/agent/" + gAgentID.asString(); // TEMPORARY FOR TESTING - CHO
+        url = regionp->getCapability("TwitterConnect");
         url += route;
     
         if (include_read_from_master && mReadFromMaster)
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index fd2bffe675d7f55fa40eedeb268273e3fd5b77c4..8e2412c84e5dc73b46d2fa91149187bbf612be94 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -31,7 +31,7 @@
            width="250"
            left="9"
            length="1"
-           max_length="119"
+           max_length="140"
            name="photo_status"
            type="string"
            word_wrap="true">