From 77189b9426c24b608017cbaed5f3f0c319adfee1 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 15 Feb 2009 20:44:57 -0600 Subject: Don't assume that start and end delimiters are same length. --- ChangeLog.txt | 6 ++++++ linden/indra/llui/llkeywords.cpp | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 0afef3a..7b011e5 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,9 @@ +2009-02-15 Jacek Antonelli + + * linden/indra/llui/llkeywords.cpp: + Don't assume that start and end delimiters are same length. + + 2009-02-14 McCabe Maxsted * 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* seg_list, const LLWS cur += cur_delimiter->getLength(); if (cur_delimiter->getType() == LLKeywordToken::TWO_SIDED_DELIMITER) { - seg_end = seg_start + between_delimiters + 2 * cur_delimiter->getLength(); + seg_end = seg_start + between_delimiters + + cur_delimiter->getLength() + + cur_delimiter->getLength2(); } else if (cur_delimiter->getType() == LLKeywordToken::ONE_SIDED_DELIMITER) { -- cgit v1.1 From 8681bd51bff45cd57aee4d467c417de5497b7ed3 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 16 Feb 2009 00:40:12 -0600 Subject: Fixed LSL comment coloring bleeding to next line. [#96] --- ChangeLog.txt | 6 ++++++ linden/indra/llui/llkeywords.cpp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7b011e5..723649f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,9 @@ +2009-02-16 Jacek Antonelli + + * linden/indra/llui/llkeywords.cpp: + Fixed LSL comment coloring bleeding to next line. [#96] + + 2009-02-15 Jacek Antonelli * linden/indra/llui/llkeywords.cpp: diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp index 653dc47..862e77b 100644 --- a/linden/indra/llui/llkeywords.cpp +++ b/linden/indra/llui/llkeywords.cpp @@ -438,7 +438,7 @@ void LLKeywords::findSegments(std::vector* seg_list, const LLWS if( *cur ) { - cur += cur_delimiter->getLength(); + cur += cur_delimiter->getLength2(); if (cur_delimiter->getType() == LLKeywordToken::TWO_SIDED_DELIMITER) { seg_end = seg_start + between_delimiters @@ -452,7 +452,7 @@ void LLKeywords::findSegments(std::vector* seg_list, const LLWS between_delimiters++; cur++; } - seg_end = seg_start + between_delimiters + 2 + cur_delimiter->getLength(); + seg_end = seg_start + between_delimiters + cur_delimiter->getLength(); } else { -- cgit v1.1