From 5ccf4a42527fb83cc316552535b04fd4b21f77a7 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 4 Nov 2014 13:09:26 +0200
Subject: [PATCH] MAINT-4581 FIXED Flickr slurl links break on some regions
with spaces in the region name
---
indra/newview/llfloaterflickr.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp
index 36afab86b79..600606d8387 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");
@@ -345,7 +345,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";
--
GitLab