diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-09-19 10:54:55 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-09-19 10:54:55 -0700 |
| commit | c25a7866408d8590b7e9672d019089cb1358dbce (patch) | |
| tree | 22c361d0b9647c74813fda9cffd75617036cef17 /indra/llui/llkeywords.cpp | |
| parent | 9ae872da5996d6c7d1f35fbf5f5c6edc75fae3c5 (diff) | |
| parent | 951c83724d7e364ac52cbee2d657711fda7d2c26 (diff) | |
Pulled merge from viewer-tiger
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 75773d7dfd..6750ee482a 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++; } |