Merge branch 'master' into DRTVWR-483

# Conflicts:
#	indra/llui/lltextbase.h
#	indra/newview/VIEWER_VERSION.txt

11 files changed, 112 insertions, 26 deletions

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 52dc908655..bcc653a602 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -1037,6 +1037,43 @@ void LLComboBox::prearrangeList(std::string filter)
 	}
 }
 
+
+//============================================================================
+// ll::ui::SearchableControl functions
+
+//virtual
+std::string LLComboBox::_getSearchText() const
+{
+    std::string res;
+    if (mList)
+    {
+        // getAllData returns a full copy of content, might be a
+        // better option to implement an mList->getSearchText(column)
+        std::vector<LLScrollListItem*> data = mList->getAllData();
+        std::vector<LLScrollListItem*>::iterator iter = data.begin();
+        while (iter != data.end())
+        {
+            LLScrollListCell* cell = (*iter)->getColumn(0);
+            if (cell)
+            {
+                std::string whitelist_url = cell->getValue().asString();
+                res += cell->getValue().asString();
+            }
+            iter++;
+        }
+    }
+    return res + getToolTip();
+}
+
+//virtual
+void LLComboBox::onSetHighlight() const
+{
+    if (mButton)
+    {
+        mButton->ll::ui::SearchableControl::setHighlighted(ll::ui::SearchableControl::getHighlighted());
+    }
+}
+
 //============================================================================
 // LLCtrlListInterface functions
 
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 4af3313162..e17d6cdfb4 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -44,7 +44,9 @@ class LLFontGL;
 class LLViewBorder;
 
 class LLComboBox
-:	public LLUICtrl, public LLCtrlListInterface
+: public LLUICtrl
+, public LLCtrlListInterface
+, public ll::ui::SearchableControl
 {
 public:	
 	typedef enum e_preferred_position
@@ -100,6 +102,9 @@ protected:
 	void	initFromParams(const Params&);
 	void	prearrangeList(std::string filter = "");
 
+    virtual std::string _getSearchText() const;
+    virtual void onSetHighlight() const;
+
 public:
 	// LLView interface
 	virtual void	onFocusLost();
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index b1123d27e5..1c4860aa99 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -84,7 +84,6 @@
 #include <sstream>
 
 #include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/type_traits.hpp>
 #include <boost/signals2.hpp>
 #include <boost/range.hpp>
@@ -131,7 +130,7 @@ public:
 
 typedef boost::function<void (const LLSD&, const LLSD&)> LLNotificationResponder;
 
-typedef boost::shared_ptr<LLNotificationResponderInterface> LLNotificationResponderPtr;
+typedef std::shared_ptr<LLNotificationResponderInterface> LLNotificationResponderPtr;
 
 typedef LLFunctorRegistry<LLNotificationResponder> LLNotificationFunctorRegistry;
 typedef LLFunctorRegistration<LLNotificationResponder> LLNotificationFunctorRegistration;
@@ -276,19 +275,19 @@ private:
 	bool								mInvertSetting;
 };
 
-typedef boost::shared_ptr<LLNotificationForm> LLNotificationFormPtr;
+typedef std::shared_ptr<LLNotificationForm> LLNotificationFormPtr;
 
 
 struct LLNotificationTemplate;
 
 // we want to keep a map of these by name, and it's best to manage them
 // with smart pointers
-typedef boost::shared_ptr<LLNotificationTemplate> LLNotificationTemplatePtr;
+typedef std::shared_ptr<LLNotificationTemplate> LLNotificationTemplatePtr;
 
 
 struct LLNotificationVisibilityRule;
 
-typedef boost::shared_ptr<LLNotificationVisibilityRule> LLNotificationVisibilityRulePtr;
+typedef std::shared_ptr<LLNotificationVisibilityRule> LLNotificationVisibilityRulePtr;
 
 /**
  * @class LLNotification
@@ -745,6 +744,10 @@ public:
 	{}
     virtual ~LLNotificationChannelBase()
     {
+        // explicit cleanup for easier issue detection
+        mChanged.disconnect_all_slots();
+        mPassedFilter.disconnect_all_slots();
+        mFailedFilter.disconnect_all_slots();
         mItems.clear();
     }
 	// you can also connect to a Channel, so you can be notified of
diff --git a/indra/llui/llnotificationslistener.h b/indra/llui/llnotificationslistener.h
index f9f7641de6..4bab377626 100644
--- a/indra/llui/llnotificationslistener.h
+++ b/indra/llui/llnotificationslistener.h
@@ -31,7 +31,6 @@
 
 #include "lleventapi.h"
 #include "llnotificationptr.h"
-#include <boost/shared_ptr.hpp>
 #include <map>
 #include <string>
 
@@ -61,7 +60,7 @@ private:
     static LLSD asLLSD(LLNotificationPtr);
 
     class Forwarder;
-    typedef std::map<std::string, boost::shared_ptr<Forwarder> > ForwarderMap;
+    typedef std::map<std::string, std::shared_ptr<Forwarder> > ForwarderMap;
     ForwarderMap mForwarders;
 	LLNotifications & mNotifications;
 };
diff --git a/indra/llui/llnotificationtemplate.h b/indra/llui/llnotificationtemplate.h
index 20cbc89ede..a8902486e4 100644
--- a/indra/llui/llnotificationtemplate.h
+++ b/indra/llui/llnotificationtemplate.h
@@ -31,7 +31,7 @@
 #include "llinitparam.h"
 #include "llnotifications.h"
 
-typedef boost::shared_ptr<LLNotificationForm> LLNotificationFormPtr;
+typedef std::shared_ptr<LLNotificationForm> LLNotificationFormPtr;
 
 // This is the class of object read from the XML file (notifications.xml, 
 // from the appropriate local language directory).
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index b52b46abcf..e40612b862 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -185,6 +185,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
 	mFontShadow(p.font_shadow),
 	mPopupMenuHandle(),
 	mReadOnly(p.read_only),
+	mSkipTripleClick(false),
 	mSkipLinkUnderline(p.skip_link_underline),
 	mSpellCheck(p.spellcheck),
 	mSpellCheckStart(-1),
@@ -1059,6 +1060,11 @@ BOOL LLTextBase::handleMouseDown(S32 x, S32 y, MASK mask)
 	// handle triple click
 	if (!mTripleClickTimer.hasExpired())
 	{
+		if (mSkipTripleClick)
+		{
+			return TRUE;
+		}
+		
 		S32 real_line = getLineNumFromDocIndex(mCursorPos, false);
 		S32 line_start = -1;
 		S32 line_end = -1;
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 5d9c15bb19..2c858cad5e 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -702,6 +702,7 @@ protected:
 	bool						mPlainText;			// didn't use Image or Icon segments
 	bool						mAutoIndent;
 	S32							mMaxTextByteLength;	// Maximum length mText is allowed to be in bytes
+	bool						mSkipTripleClick;
 	bool						mAlwaysShowIcons;
 
 	bool						mSkipLinkUnderline;
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index 134afc005b..c567451973 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -45,7 +45,9 @@ LLTextBox::LLTextBox(const LLTextBox::Params& p)
 :	LLTextBase(p),
 	mClickedCallback(NULL),
 	mShowCursorHand(true)
-{}
+{
+	mSkipTripleClick = true;
+}
 
 LLTextBox::~LLTextBox()
 {}
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index e43c52c0c2..38495e1e0b 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -35,6 +35,7 @@
 
 #include "llavatarnamecache.h"
 #include "llcachename.h"
+#include "llregex.h"
 #include "lltrans.h"
 #include "lluicolortable.h"
 #include "message.h"
@@ -181,11 +182,51 @@ bool LLUrlEntryBase::isLinkDisabled() const
 	return globally_disabled;
 }
 
-bool LLUrlEntryBase::isWikiLinkCorrect(std::string url)
+bool LLUrlEntryBase::isWikiLinkCorrect(const std::string &labeled_url) const
 {
-	LLWString label = utf8str_to_wstring(getLabelFromWikiLink(url));
-	label.erase(std::remove(label.begin(), label.end(), L'\u200B'), label.end());
-	return (LLUrlRegistry::instance().hasUrl(wstring_to_utf8str(label))) ? false : true;
+	LLWString wlabel = utf8str_to_wstring(getLabelFromWikiLink(labeled_url));
+	wlabel.erase(std::remove(wlabel.begin(), wlabel.end(), L'\u200B'), wlabel.end());
+
+    // Unicode URL validation, see SL-15243
+    std::replace_if(wlabel.begin(),
+                    wlabel.end(),
+                    [](const llwchar &chr)
+                    {
+                        return (chr == L'\u2024') // "One Dot Leader"
+                               || (chr == L'\uFE52') // "Small Full Stop"
+                               || (chr == L'\uFF0E') // "Fullwidth Full Stop"
+                               // Not a decomposition, but suficiently similar
+                               || (chr == L'\u05C5'); // "Hebrew Mark Lower Dot"
+                    },
+                    L'\u002E'); // Dot "Full Stop"
+
+    std::replace_if(wlabel.begin(),
+        wlabel.end(),
+        [](const llwchar &chr)
+    {
+        return (chr == L'\u02D0') // "Modifier Letter Colon"
+            || (chr == L'\uFF1A') // "Fullwidth Colon"
+            || (chr == L'\uFE55'); // "Small Colon"
+    },
+        L'\u003A'); // Colon
+
+    std::replace_if(wlabel.begin(),
+        wlabel.end(),
+        [](const llwchar &chr)
+    {
+        return (chr == L'\uFF0F'); // "Fullwidth Solidus"
+    },
+        L'\u002F'); // Solidus
+
+    std::string label = wstring_to_utf8str(wlabel);
+    if ((label.find(".com") != std::string::npos
+         || label.find("www.") != std::string::npos)
+        && label.find("://") == std::string::npos)
+    {
+        label = "http://" + label;
+    }
+
+	return (LLUrlRegistry::instance().hasUrl(label)) ? false : true;
 }
 
 std::string LLUrlEntryBase::urlToLabelWithGreyQuery(const std::string &url) const
@@ -1416,7 +1457,7 @@ std::string LLUrlEntryIcon::getIcon(const std::string &url)
 	// Grep icon info between <icon>...</icon> tags
 	// matches[1] contains the icon name/path
 	boost::match_results<std::string::const_iterator> matches;
-	mIcon = (boost::regex_match(url, matches, mPattern) && matches[1].matched)
+	mIcon = (ll_regex_match(url, matches, mPattern) && matches[1].matched)
 		? matches[1]
 		: LLStringUtil::null;
 	LLStringUtil::trim(mIcon);
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 4af1ab5096..102e0a4fd9 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -105,7 +105,7 @@ public:
 
 	bool isLinkDisabled() const;
 
-	bool isWikiLinkCorrect(std::string url);
+	bool isWikiLinkCorrect(const std::string &url) const;
 
 	virtual bool isSLURLvalid(const std::string &url) const { return TRUE; };
 
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index 321a0ec5b9..bfcd970529 100644
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -26,10 +26,10 @@
  */
 
 #include "linden_common.h"
+#include "llregex.h"
 #include "llurlregistry.h"
 #include "lluriparser.h"
 
-#include <boost/regex.hpp>
 
 // default dummy callback that ignores any label updates from the server
 void LLUrlRegistryNullCallback(const std::string &url, const std::string &label, const std::string& icon)
@@ -108,15 +108,7 @@ static bool matchRegex(const char *text, boost::regex regex, U32 &start, U32 &en
 	boost::cmatch result;
 	bool found;
 
-	// regex_search can potentially throw an exception, so check for it
-	try
-	{
-		found = boost::regex_search(text, result, regex);
-	}
-	catch (std::runtime_error &)
-	{
-		return false;
-	}
+	found = ll_regex_search(text, result, regex);
 
 	if (! found)
 	{