6 files changed, 46 insertions, 2 deletions
diff --git a/indra/llui/llchatmentionhelper.cpp b/indra/llui/llchatmentionhelper.cpp
index f7769b2cbe..5745389a58 100644
--- a/indra/llui/llchatmentionhelper.cpp
+++ b/indra/llui/llchatmentionhelper.cpp
@@ -98,7 +98,14 @@ void LLChatMentionHelper::showHelper(LLUICtrl* host_ctrl, S32 local_x, S32 local
     LLRect rect = av_picker_floater->getRect();
     rect.setLeftTopAndSize(floater_x, floater_y + rect.getHeight(), rect.getWidth(), rect.getHeight());
     av_picker_floater->setRect(rect);
-    av_picker_floater->openFloater(LLSD().with("av_name", av_name));
+    if (av_picker_floater->isShown())
+    {
+        av_picker_floater->onOpen(LLSD().with("av_name", av_name));
+    }
+    else
+    {
+        av_picker_floater->openFloater(LLSD().with("av_name", av_name));
+    }
 }
 
 void LLChatMentionHelper::hideHelper(const LLUICtrl* ctrl)
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index 234d0dc7f9..2ee018a90a 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -154,7 +154,7 @@ protected:
     virtual bool isHighlightActive();
     virtual bool isFadeItem();
     virtual bool isFlashing() { return false; }
-    virtual void setFlashState(bool) { }
+    virtual void setFlashState(bool, bool) { }
 
     static LLFontGL* getLabelFontForStyle(U8 style);
     const LLFontGL* getLabelFont();
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 7218211a44..bcd13b7f0b 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -630,6 +630,11 @@ LLUUID  LLUrlEntryAgent::getID(const std::string &string) const
     return LLUUID(getIDStringFromUrl(string));
 }
 
+bool LLUrlEntryAgent::isAgentID(const std::string& url) const
+{
+    return sAgentID == getID(url);
+}
+
 std::string LLUrlEntryAgent::getTooltip(const std::string &string) const
 {
     // return a tooltip corresponding to the URL type instead of the generic one
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 740e99acfd..6e7d2fc80f 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -103,6 +103,7 @@ public:
     virtual bool getSkipProfileIcon(const std::string& string) const { return false; }
 
     virtual LLUUID  getID(const std::string &string) const { return LLUUID::null; }
+    virtual bool isAgentID(const std::string& url) const { return false; }
 
     bool isLinkDisabled() const;
 
@@ -232,6 +233,8 @@ public:
     /*virtual*/ LLStyle::Params getStyle(const std::string &url) const;
     /*virtual*/ LLUUID  getID(const std::string &string) const;
 
+    bool isAgentID(const std::string& url) const;
+
     LLStyle::EUnderlineLink getUnderline(const std::string& string) const;
 
 protected:
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index 02d88c83fb..cb101d325d 100644
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -327,3 +327,30 @@ void LLUrlRegistry::setKeybindingHandler(LLKeyBindingToStringHandler* handler)
     LLUrlEntryKeybinding *entry = (LLUrlEntryKeybinding*)mUrlEntryKeybinding;
     entry->setHandler(handler);
 }
+
+bool LLUrlRegistry::containsAgentMention(const std::string& text)
+{
+    // avoid costly regexes if there is clearly no URL in the text
+    if (!stringHasUrl(text))
+    {
+        return false;
+    }
+
+    try
+    {
+        boost::sregex_iterator it(text.begin(), text.end(), mUrlEntryAgentMention->getPattern());
+        boost::sregex_iterator end;
+        for (; it != end; ++it)
+        {
+            if (mUrlEntryAgentMention->isAgentID(it->str()))
+            {
+               return true;
+            }
+        }
+    }
+    catch (boost::regex_error&)
+    {
+        LL_INFOS() << "Regex error for: " << text << LL_ENDL;
+    }
+    return false;
+}
diff --git a/indra/llui/llurlregistry.h b/indra/llui/llurlregistry.h
index b9502f4592..592e422487 100644
--- a/indra/llui/llurlregistry.h
+++ b/indra/llui/llurlregistry.h
@@ -92,6 +92,8 @@ public:
     // Set handler for url registry to be capable of parsing and populating keybindings
     void setKeybindingHandler(LLKeyBindingToStringHandler* handler);
 
+    bool containsAgentMention(const std::string& text);
+
 private:
     std::vector<LLUrlEntryBase *> mUrlEntry;
     LLUrlEntryBase* mUrlEntryTrusted;