diff options
| author | Jacek Antonelli | 2009-02-15 20:44:57 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-02-15 20:53:33 -0600 |
| commit | 77189b9426c24b608017cbaed5f3f0c319adfee1 (patch) | |
| tree | 4d2ddd3dcf9d9e19c1e0c097008f67db262e5c1a /linden/indra/llui/llkeywords.cpp | |
| parent | Merge commit 'mccabe/next' into next (diff) | |
| download | meta-impy-77189b9426c24b608017cbaed5f3f0c319adfee1.zip meta-impy-77189b9426c24b608017cbaed5f3f0c319adfee1.tar.gz meta-impy-77189b9426c24b608017cbaed5f3f0c319adfee1.tar.bz2 meta-impy-77189b9426c24b608017cbaed5f3f0c319adfee1.tar.xz | |
Don't assume that start and end delimiters are same length.
Diffstat (limited to 'linden/indra/llui/llkeywords.cpp')
| -rw-r--r-- | linden/indra/llui/llkeywords.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 | { |