1 files changed, 9 insertions, 9 deletions

diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index 3adde76..1d157d2 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -233,7 +233,7 @@ LLColor3 LLKeywords::readColor( const LLString& s )
 
 // Walk through a string, applying the rules specified by the keyword token list and
 // create a list of color segments.
-void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWString& wtext)
+void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWString& wtext, const LLColor4 &defaultColor)
 {
         std::for_each(seg_list->begin(), seg_list->end(), DeletePointer());
         seg_list->clear();
@@ -245,7 +245,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
         
         S32 text_len = wtext.size();
 
-        seg_list->push_back( new LLTextSegment( LLColor3(0,0,0), 0, text_len ) );
+        seg_list->push_back( new LLTextSegment( LLColor3(defaultColor), 0, text_len ) ); 
 
         const llwchar* base = wtext.c_str();
         const llwchar* cur = base;
@@ -299,7 +299,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
                                                 //llinfos << "Seg: [" << (char*)LLString( base, seg_start, seg_end-seg_start) << "]" << llendl;
                                                 LLTextSegment* text_segment = new LLTextSegment( cur_token->getColor(), seg_start, seg_end );
                                                 text_segment->setToken( cur_token );
-                                                insertSegment( seg_list, text_segment, text_len);
+                                                insertSegment( seg_list, text_segment, text_len, defaultColor);
                                                 line_done = TRUE; // to break out of second loop.
                                                 break;
                                         }
@@ -409,7 +409,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
                                         //llinfos << "Seg: [" << (char*)LLString( base, seg_start, seg_end-seg_start ) << "]" << llendl;
                                         LLTextSegment* text_segment = new LLTextSegment( cur_delimiter->getColor(), seg_start, seg_end );
                                         text_segment->setToken( cur_delimiter );
-                                        insertSegment( seg_list, text_segment, text_len);
+                                        insertSegment( seg_list, text_segment, text_len, defaultColor);
 
                                         // Note: we don't increment cur, since the end of one delimited seg may be immediately
                                         // followed by the start of another one.
@@ -442,7 +442,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 
                                                 LLTextSegment* text_segment = new LLTextSegment( cur_token->getColor(), seg_start, seg_end );
                                                 text_segment->setToken( cur_token );
-                                                insertSegment( seg_list, text_segment, text_len);
+                                                insertSegment( seg_list, text_segment, text_len, defaultColor);
                                         }
                                         cur += seg_len; 
                                         continue;
@@ -457,7 +457,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
         }
 }
 
-void LLKeywords::insertSegment(std::vector<LLTextSegment*>* seg_list, LLTextSegment* new_segment, S32 text_len )
+void LLKeywords::insertSegment(std::vector<LLTextSegment*>* seg_list, LLTextSegment* new_segment, S32 text_len, const LLColor4 &defaultColor )
 {
         LLTextSegment* last = seg_list->back();
         S32 new_seg_end = new_segment->getEnd();
@@ -475,7 +475,7 @@ void LLKeywords::insertSegment(std::vector<LLTextSegment*>* seg_list, LLTextSegm
 
         if( new_seg_end < text_len )
         {
-                seg_list->push_back( new LLTextSegment( LLColor3(0,0,0), new_seg_end, text_len ) );
+                seg_list->push_back( new LLTextSegment( defaultColor, new_seg_end, text_len ) );
         }
 }