diff options
| author | elektrahesse | 2010-09-15 21:14:55 +0200 |
|---|---|---|
| committer | elektrahesse | 2010-09-15 21:14:55 +0200 |
| commit | 74363f85fa96f76c0ba83586a0d97af35bed4b4a (patch) | |
| tree | 8f6e1b57dc25f96f392b6adbe76236f9ad603e22 /linden | |
| parent | Added TAB as name completion hotkey, to be used after at least 3 chars otherw... (diff) | |
| download | meta-impy-74363f85fa96f76c0ba83586a0d97af35bed4b4a.zip meta-impy-74363f85fa96f76c0ba83586a0d97af35bed4b4a.tar.gz meta-impy-74363f85fa96f76c0ba83586a0d97af35bed4b4a.tar.bz2 meta-impy-74363f85fa96f76c0ba83586a0d97af35bed4b4a.tar.xz | |
Added more punctuation support to both names autocomplete and names highlight in chat
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llchatbar.cpp | 2 | ||||
| -rw-r--r-- | linden/indra/newview/llfloaterchat.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp index 2009905..c7391d9 100644 --- a/linden/indra/newview/llchatbar.cpp +++ b/linden/indra/newview/llchatbar.cpp | |||
| @@ -236,7 +236,7 @@ BOOL LLChatBar::handleKeyHere( KEY key, MASK mask ) | |||
| 236 | left_part = txt; | 236 | left_part = txt; |
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | std::string pattern_s = "(^|.*[\\.\\?!:;,\\*\\(\\s]+)([a-z0-9]+)$"; | 239 | std::string pattern_s = "(^|.*[_=&\\|\\<\\>#@\\[\\]\\-\\+\"',\\.\\?!:;\\*\\(\\)\\s]+)([a-z0-9]+)$"; |
| 240 | boost::match_results<std::string::const_iterator> what; | 240 | boost::match_results<std::string::const_iterator> what; |
| 241 | boost::regex expression(pattern_s, boost::regex::icase); | 241 | boost::regex expression(pattern_s, boost::regex::icase); |
| 242 | if (boost::regex_search(to_match, what, expression, boost::match_extra)) | 242 | if (boost::regex_search(to_match, what, expression, boost::match_extra)) |
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp index b1c1356..f352926 100644 --- a/linden/indra/newview/llfloaterchat.cpp +++ b/linden/indra/newview/llfloaterchat.cpp | |||
| @@ -456,7 +456,7 @@ void LLFloaterChat::updateSettings() | |||
| 456 | BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line) | 456 | BOOL 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 | ||