From 8d1339e14978dcc2071912262889ea864f811e26 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 15 Jan 2009 15:57:38 -0700
Subject: Fixed crash bug while loading keywords

---
 linden/indra/llui/llkeywords.cpp               | 4 ++--
 linden/indra/newview/app_settings/keywords.ini | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index 2d5f53d..8cd33a2 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -239,11 +239,11 @@ void LLKeywords::addToken(LLKeywordToken::TOKEN_TYPE type,
 	switch(type)
 	{
 	case LLKeywordToken::WORD:
-		mWordTokenMap[key] = new LLKeywordToken(type, color, key, tool_tip, NULL);
+		mWordTokenMap[key] = new LLKeywordToken(type, color, key, tool_tip, delimiter);
 		break;
 
 	case LLKeywordToken::LINE:
-		mLineTokenList.push_front(new LLKeywordToken(type, color, key, tool_tip, NULL));
+		mLineTokenList.push_front(new LLKeywordToken(type, color, key, tool_tip, delimiter));
 		break;
 
 	case LLKeywordToken::TWO_SIDED_DELIMITER:
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index 28ecb00..2a911ba 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -533,7 +533,6 @@ SQRT2				1.4142135623730950488016887242097
 ZERO_VECTOR			<0.0, 0.0, 0.0>
 ZERO_ROTATION		<0.0, 0.0, 0.0, 1.0>
 
-
 # flow control keywords
 [word 0, 0, .8]
 for					for loop:for (initializer; test; iteration):{:   statements:}
@@ -552,10 +551,10 @@ return				Leave current function or event handler
 [one_sided_delimiter .8, .3, .15]
 //					Comment:Non-functional commentary or disabled code
 [two_sided_delimiter .8, .3, .15]
-/*	*/				Comment:Non-functional commentary or disabled code
+/* */					Comment:Non-functional commentary or disabled code
 
 # String literals
 [two_sided_delimiter_esc 0, .2, 0]
-"	"				String literal
+" "					String literal
 
-#functions are supplied by the program now.
+#functions are supplied by the program now.
\ No newline at end of file
-- 
cgit v1.1