diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-13 10:23:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-13 10:23:22 -0500 |
| commit | d5f48181b50d9e941abafd76692359869e71a36d (patch) | |
| tree | 66f2a744ca09c0ff483038ed639a5dd552cd5272 /indra/llui/lltextparser.cpp | |
| parent | 34b1982d33c83bb58c95bcedf36c9b5cd097584f (diff) | |
| parent | dbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff) | |
merge up to latest viewer-development
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; |