2 files changed, 18 insertions, 4 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0a17bb1..17d1769 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,4 @@
-2009-02-17  McCabe Maxsted  <hakushakukun@gmail.com>
+2009-02-24  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
         Changed the show/hide shortcuts to be linux friendly.
@@ -23,6 +23,12 @@
         Fixed crash in Top Scripts.
 
 
+2009-02-16  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llui/llkeywords.cpp:
+        Fixed LSL comment coloring bleeding to next line. [#96]
+
+
 2009-02-15  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llcommon/llsdserialize.cpp:
@@ -38,6 +44,12 @@
         Ditto.
 
 
+        Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llui/llkeywords.cpp:
+        Don't assume that start and end delimiters are same length.
+
+
 2009-02-14  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/newview/app_settings/settings.xml:
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
 
                                                 if( *cur )
                                                 {
-                                                        cur += cur_delimiter->getLength();
+                                                        cur += cur_delimiter->getLength2();
                                                         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)
                                                         {
@@ -450,7 +452,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* 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
                                                         {