aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorelektrahesse2010-09-12 18:18:21 +0200
committerelektrahesse2010-09-12 18:18:21 +0200
commit4d67fcc433be184429a6c70621d3368386bc01e2 (patch)
treed27c55120976ff27b5fadb6ad9c9cb165592f98b /linden
parentMerge remote branch 'elektra/weekly' into weekly (diff)
downloadmeta-impy-4d67fcc433be184429a6c70621d3368386bc01e2.zip
meta-impy-4d67fcc433be184429a6c70621d3368386bc01e2.tar.gz
meta-impy-4d67fcc433be184429a6c70621d3368386bc01e2.tar.bz2
meta-impy-4d67fcc433be184429a6c70621d3368386bc01e2.tar.xz
Fixed the regexp to match commas before the name
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/llfloaterchat.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 1cf85de..c956aba 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -456,7 +456,7 @@ void LLFloaterChat::updateSettings()
456BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line) 456BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line)
457{ 457{
458 std::string my_name = gSavedSettings.getString("FirstName"); 458 std::string my_name = gSavedSettings.getString("FirstName");
459 std::string pattern_s = "(^|.*[\\.\\?!:;\\*\\(\\s]+)(" + my_name + ")([,\\.\\?!:;\\*\\)\\s]+.*|$)"; 459 std::string pattern_s = "(^|.*[,\\.\\?!:;\\*\\(\\s]+)(" + my_name + ")([,\\.\\?!:;\\*\\)\\s]+.*|$)";
460 boost::smatch what; 460 boost::smatch what;
461 boost::regex e1(pattern_s, boost::regex::icase); 461 boost::regex e1(pattern_s, boost::regex::icase);
462 462