diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-05 14:37:06 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-05 14:37:06 -0500 |
commit | bf8e1137012c1e26d570545db1feda77c60aa6ba (patch) | |
tree | f2a0da29601da94b496c545436c1ef310bc4bed5 /indra/llui/lltextparser.cpp | |
parent | d8aa31d10a89aa826cc549594c083a054a2ad967 (diff) | |
parent | 7026c80d51128854458f585e50b3b9e3ecab555a (diff) |
merge
Diffstat (limited to 'indra/llui/lltextparser.cpp')
-rw-r--r-- | indra/llui/lltextparser.cpp | 2 |
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; |