Merge with Viewer Release (after Viewer Release updated with Viewer Tools Update)

1 files changed, 7 insertions, 2 deletions

diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp
index 51352e083a..cd132b843d 100644
--- a/indra/newview/llfloaterflickr.cpp
+++ b/indra/newview/llfloaterflickr.cpp
@@ -51,7 +51,7 @@
 #include "lltabcontainer.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
-
+#include <boost/regex.hpp>
 static LLPanelInjector<LLFlickrPhotoPanel> t_panel_photo("llflickrphotopanel");
 static LLPanelInjector<LLFlickrAccountPanel> t_panel_account("llflickraccountpanel");
 
@@ -344,7 +344,12 @@ void LLFlickrPhotoPanel::sendPhoto()
 		std::string parcel_name = LLViewerParcelMgr::getInstance()->getAgentParcelName();
 		if (!parcel_name.empty())
 		{
-			photo_link_text += " at " + parcel_name;
+			boost::regex pattern = boost::regex("\\S\\.[a-zA-Z]{2,}");
+			boost::match_results<std::string::const_iterator> matches;
+			if(!boost::regex_search(parcel_name, matches, pattern))
+			{
+				photo_link_text += " at " + parcel_name;
+			}
 		}
 		photo_link_text += " in Second Life";