summaryrefslogtreecommitdiff
path: root/indra/llui/lltextparser.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-12 10:45:13 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-12 10:45:13 -0500
commit642ea00a08d454dfb4eb5278b659260803816fc2 (patch)
tree7bc0734dcd80a78a597779c70bcf6c3f8324f949 /indra/llui/lltextparser.cpp
parent8a51346d6f0d9171263124c203b2194db914b47d (diff)
parentdbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff)
merge
Diffstat (limited to 'indra/llui/lltextparser.cpp')
-rw-r--r--indra/llui/lltextparser.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/lltextparser.cpp b/indra/llui/lltextparser.cpp
index a4fe4f6ca8..8a85f99e0c 100644
--- a/indra/llui/lltextparser.cpp
+++ b/indra/llui/lltextparser.cpp
@@ -46,8 +46,6 @@ LLTextParser::LLTextParser()
{}
-// Moved triggerAlerts() to llfloaterchat.cpp to break llui/llaudio library dependency.
-
S32 LLTextParser::findPattern(const std::string &text, LLSD highlight)
{
if (!highlight.has("pattern")) return -1;