diff options
| author | McCabe Maxsted | 2009-02-25 01:15:15 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-02-25 01:15:15 -0700 |
| commit | a6f2f26b92b0548bdb9891df98fe1cc22464719f (patch) | |
| tree | 727a2be45bcc93d11912c380a2ec55e1371929a0 /linden | |
| parent | Added menu_pie_hud.xml, removed legacy rate pie menu references (diff) | |
| parent | Fixed LSL comment coloring bleeding to next line. [#96] (diff) | |
| download | meta-impy-a6f2f26b92b0548bdb9891df98fe1cc22464719f.zip meta-impy-a6f2f26b92b0548bdb9891df98fe1cc22464719f.tar.gz meta-impy-a6f2f26b92b0548bdb9891df98fe1cc22464719f.tar.bz2 meta-impy-a6f2f26b92b0548bdb9891df98fe1cc22464719f.tar.xz | |
merged in jacek/next
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/llui/llkeywords.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp index cd58d70..862e77b 100644 --- a/linden/indra/llui/llkeywords.cpp +++ b/linden/indra/llui/llkeywords.cpp | |||
| @@ -438,10 +438,12 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS | |||
| 438 | 438 | ||
| 439 | if( *cur ) | 439 | if( *cur ) |
| 440 | { | 440 | { |
| 441 | cur += cur_delimiter->getLength(); | 441 | cur += cur_delimiter->getLength2(); |
| 442 | if (cur_delimiter->getType() == LLKeywordToken::TWO_SIDED_DELIMITER) | 442 | if (cur_delimiter->getType() == LLKeywordToken::TWO_SIDED_DELIMITER) |
| 443 | { | 443 | { |
| 444 | seg_end = seg_start + between_delimiters + 2 * cur_delimiter->getLength(); | 444 | seg_end = seg_start + between_delimiters |
| 445 | + cur_delimiter->getLength() | ||
| 446 | + cur_delimiter->getLength2(); | ||
| 445 | } | 447 | } |
| 446 | else if (cur_delimiter->getType() == LLKeywordToken::ONE_SIDED_DELIMITER) | 448 | else if (cur_delimiter->getType() == LLKeywordToken::ONE_SIDED_DELIMITER) |
| 447 | { | 449 | { |
| @@ -450,7 +452,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS | |||
| 450 | between_delimiters++; | 452 | between_delimiters++; |
| 451 | cur++; | 453 | cur++; |
| 452 | } | 454 | } |
| 453 | seg_end = seg_start + between_delimiters + 2 + cur_delimiter->getLength(); | 455 | seg_end = seg_start + between_delimiters + cur_delimiter->getLength(); |
| 454 | } | 456 | } |
| 455 | else | 457 | else |
| 456 | { | 458 | { |