diff options
-rw-r--r-- | ChangeLog.txt | 6 | ||||
-rw-r--r-- | linden/indra/llui/llkeywords.cpp | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 0afef3a..7b011e5 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,9 @@ | |||
1 | 2009-02-15 Jacek Antonelli <jacek.antonelli@gmail.com> | ||
2 | |||
3 | * linden/indra/llui/llkeywords.cpp: | ||
4 | Don't assume that start and end delimiters are same length. | ||
5 | |||
6 | |||
1 | 2009-02-14 McCabe Maxsted <hakushakukun@gmail.com> | 7 | 2009-02-14 McCabe Maxsted <hakushakukun@gmail.com> |
2 | 8 | ||
3 | * linden/indra/newview/app_settings/settings.xml: | 9 | * linden/indra/newview/app_settings/settings.xml: |
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp index cd58d70..653dc47 100644 --- a/linden/indra/llui/llkeywords.cpp +++ b/linden/indra/llui/llkeywords.cpp | |||
@@ -441,7 +441,9 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS | |||
441 | cur += cur_delimiter->getLength(); | 441 | cur += cur_delimiter->getLength(); |
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 | { |