diff options
| author | McCabe Maxsted | 2009-10-03 11:17:31 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-10-03 11:17:31 -0700 |
| commit | 60c2a946c2d1d760ce02edad62697d9d0efbfb79 (patch) | |
| tree | f8e4bc5ac1bab087ff305a72d7d3b4d17f772a9f /linden/indra/llui | |
| parent | Fixed search window height being too small for new profile layout (diff) | |
| download | meta-impy-60c2a946c2d1d760ce02edad62697d9d0efbfb79.zip meta-impy-60c2a946c2d1d760ce02edad62697d9d0efbfb79.tar.gz meta-impy-60c2a946c2d1d760ce02edad62697d9d0efbfb79.tar.bz2 meta-impy-60c2a946c2d1d760ce02edad62697d9d0efbfb79.tar.xz | |
Fixed an issue with llkeywords.cpp(385) and Visual Studio
Diffstat (limited to 'linden/indra/llui')
| -rw-r--r-- | linden/indra/llui/llkeywords.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp index b7e7d87..3580567 100644 --- a/linden/indra/llui/llkeywords.cpp +++ b/linden/indra/llui/llkeywords.cpp | |||
| @@ -380,9 +380,9 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS | |||
| 380 | seg_start = cur - base; | 380 | seg_start = cur - base; |
| 381 | cur += cur_delimiter->getLength(); | 381 | cur += cur_delimiter->getLength(); |
| 382 | 382 | ||
| 383 | if( cur_delimiter->getType() == LLKeywordToken::TWO_SIDED_DELIMITER || LLKeywordToken::TWO_SIDED_DELIMITER_ESC) | 383 | LLKeywordToken::TOKEN_TYPE type = cur_delimiter->getType(); |
| 384 | if (type == LLKeywordToken::TWO_SIDED_DELIMITER || type == LLKeywordToken::TWO_SIDED_DELIMITER_ESC) | ||
| 384 | { | 385 | { |
| 385 | llassert( cur_delimiter->getDelimiter() != NULL ); | ||
| 386 | while( *cur && !cur_delimiter->isTail(cur)) | 386 | while( *cur && !cur_delimiter->isTail(cur)) |
| 387 | { | 387 | { |
| 388 | // Check for an escape sequence. | 388 | // Check for an escape sequence. |