diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:14:53 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:14:53 -0500 |
| commit | 9c56eb9eadc08aaf939759f4991fc8f201289a13 (patch) | |
| tree | 19dbf730addfdaa4cbeba2b5c7491cc1db61c7c6 /indra/llui/llkeywords.cpp | |
| parent | bf2e3fca73b80afa10a1c913ba752fcaf79ccd19 (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
merge changes for 3.7.23
Diffstat (limited to 'indra/llui/llkeywords.cpp')
| -rwxr-xr-x | indra/llui/llkeywords.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index 70d738d5ff..6c1333a2af 100755 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -505,7 +505,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW } // Skip white space - while( *cur && isspace(*cur) && (*cur != '\n') ) + while( *cur && iswspace(*cur) && (*cur != '\n') ) { cur++; } @@ -548,7 +548,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW } // Skip white space - while( *cur && isspace(*cur) && (*cur != '\n') ) + while( *cur && iswspace(*cur) && (*cur != '\n') ) { cur++; } @@ -655,10 +655,10 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW // check against words llwchar prev = cur > base ? *(cur-1) : 0; - if( !isalnum( prev ) && (prev != '_') ) + if( !iswalnum( prev ) && (prev != '_') ) { const llwchar* p = cur; - while( isalnum( *p ) || (*p == '_') ) + while( iswalnum( *p ) || (*p == '_') ) { p++; } |