diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index e054d91331..ca7a457718 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -192,12 +192,7 @@ public:
 								 const std::vector<std::string>& funcs,
 								 const std::vector<std::string>& tooltips,
 								 const LLColor3& func_color);
-	// NaCl - LSL Preprocessor
-	void addToken(LLKeywordToken::TOKEN_TYPE type,
-          const std::string& key,
-          const LLColor3& color,
-          const std::string& tool_tip = LLStringUtil::null);
-	// NaCl End
+
 	LLKeywords::keyword_iterator_t keywordsBegin()	{ return mKeywords.begin(); }
 	LLKeywords::keyword_iterator_t keywordsEnd()	{ return mKeywords.end(); }
 
diff --git a/indra/newview/skins/ansastorm/colors.xml b/indra/newview/skins/ansastorm/colors.xml
index ccbd8a69fe..d7fb094651 100644
--- a/indra/newview/skins/ansastorm/colors.xml
+++ b/indra/newview/skins/ansastorm/colors.xml
@@ -1180,6 +1180,9 @@
   <color
       name="ScriptBackground"
       reference="White" />
+  <color
+      name="ScriptCursorColor"
+      reference="Black" />
   <color
       name="SyntaxSection"
       value=".5 .1 .3 1" />
diff --git a/indra/newview/skins/ansastorm/themes/classic_brown/colors.xml b/indra/newview/skins/ansastorm/themes/classic_brown/colors.xml
index 33a69a1b10..6149320e0d 100644
--- a/indra/newview/skins/ansastorm/themes/classic_brown/colors.xml
+++ b/indra/newview/skins/ansastorm/themes/classic_brown/colors.xml
@@ -1180,6 +1180,9 @@
   <color
       name="ScriptBackground"
       reference="White" />
+  <color
+      name="ScriptCursorColor"
+      reference="Black" />
   <color
       name="SyntaxSection"
       value=".5 .1 .3 1" />
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 23dcf80f3c..148e7bfb41 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -1121,6 +1121,9 @@
   <color
       name="ScriptBackground"
       reference="White" />
+  <color
+      name="ScriptCursorColor"
+      reference="Black" />
   <color
       name="SyntaxSection"
       value=".5 .1 .3 1" />
diff --git a/indra/newview/skins/default/xui/en/floater_fs_script_editor_prefs.xml b/indra/newview/skins/default/xui/en/floater_fs_script_editor_prefs.xml
index 22bf6c4fae..3d9e762a5d 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_script_editor_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_script_editor_prefs.xml
@@ -49,6 +49,36 @@
 		top_delta="5"
 		width="100">
         Text
+    </text>
+	<color_swatch
+		can_apply_immediately="true"
+		follows="left|top"
+		height="24"
+		label_height="0"
+		layout="topleft"
+		left="15"
+		name="cursor"
+		top_pad="10"
+		width="44" >
+        <color_swatch.init_callback
+		function="ScriptPref.getUIColor"
+		parameter="ScriptCursorColor" />
+        <color_swatch.commit_callback
+		function="ScriptPref.applyUIColor"
+		parameter="ScriptCursorColor" />
+    </color_swatch>
+    <text
+		type="string"
+		length="1"
+		follows="left|top"
+		height="10"
+		layout="topleft"
+		left_pad="5"
+		mouse_opaque="false"
+		name="cursor_label"
+		top_delta="5"
+		width="100">
+        Cursor
     </text>
 	<color_swatch
 		can_apply_immediately="true"
@@ -177,9 +207,39 @@
 		label_height="0"
 		layout="topleft"
 		left="15"
-		name="string_literal"
+		name="comment"
 		top_pad="10"
 		width="44" >
+        <color_swatch.init_callback
+		function="ScriptPref.getUIColor"
+		parameter="SyntaxComment" />
+        <color_swatch.commit_callback
+		function="ScriptPref.applyUIColor"
+		parameter="SyntaxComment" />
+    </color_swatch>
+    <text
+		type="string"
+		length="1"
+		follows="left|top"
+		height="10"
+		layout="topleft"
+		left_pad="5"
+		mouse_opaque="false"
+		name="comment_label"
+		top_delta="5"
+		width="100">
+        Comment
+    </text>
+	<color_swatch
+		can_apply_immediately="true"
+		follows="left|top"
+		height="24"
+		label_height="0"
+		layout="topleft"
+		left="170"
+		name="string_literal"
+		top="45"
+		width="44" >
         <color_swatch.init_callback
 		function="ScriptPref.getUIColor"
 		parameter="SyntaxStringLiteral" />
@@ -209,7 +269,7 @@
 		layout="topleft"
 		left="170"
 		name="i_constant"
-		top="45"
+		top_pad="10"
 		width="44" >
         <color_swatch.init_callback
 		function="ScriptPref.getUIColor"
@@ -350,36 +410,6 @@
 		top_delta="5"
 		width="100">
         Flow Control
-    </text>
-	<color_swatch
-		can_apply_immediately="true"
-		follows="left|top"
-		height="24"
-		label_height="0"
-		layout="topleft"
-		left="170"
-		name="comment"
-		top_pad="10"
-		width="44" >
-        <color_swatch.init_callback
-		function="ScriptPref.getUIColor"
-		parameter="SyntaxComment" />
-        <color_swatch.commit_callback
-		function="ScriptPref.applyUIColor"
-		parameter="SyntaxComment" />
-    </color_swatch>
-    <text
-		type="string"
-		length="1"
-		follows="left|top"
-		height="10"
-		layout="topleft"
-		left_pad="5"
-		mouse_opaque="false"
-		name="comment_label"
-		top_delta="5"
-		width="100">
-        Comment
     </text>
 	<color_swatch
 		can_apply_immediately="true"
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index 0455971325..192ca2e079 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -330,6 +330,7 @@
 	 bg_focus_color="ScriptBackground"
      text_readonly_color="ScriptText"
      bg_readonly_color="ScriptBackground"
+     cursor_color="ScriptCursorColor"
      width="487"
      show_line_numbers="true"
      enable_tooltip_paste="true"
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed_preproc.xml b/indra/newview/skins/default/xui/en/panel_script_ed_preproc.xml
index 1bc3c1dda9..06047c5985 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed_preproc.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed_preproc.xml
@@ -354,6 +354,7 @@
 		 bg_focus_color="ScriptBackground"
 		 text_readonly_color="DkGray"
 		 bg_readonly_color="TextBgWriteableColor"
+		 cursor_color="ScriptCursorColor"
 		 width="487"
 		 show_line_numbers="true"
 		 enable_tooltip_paste="true"
@@ -389,6 +390,7 @@
 		 bg_focus_color="ScriptBackground"
 		 text_readonly_color="ScriptText"
 		 bg_readonly_color="ScriptBackground"
+		 cursor_color="ScriptCursorColor"
 		 width="487"
 		 show_line_numbers="true" 
 		 word_wrap="true">
diff --git a/indra/newview/skins/metaharper/colors.xml b/indra/newview/skins/metaharper/colors.xml
index 157b12517f..43a30f9f75 100644
--- a/indra/newview/skins/metaharper/colors.xml
+++ b/indra/newview/skins/metaharper/colors.xml
@@ -848,6 +848,9 @@
   <color
       name="ScriptBackground"
       reference="White" />
+  <color
+      name="ScriptCursorColor"
+      reference="Black" />
   <color
       name="SyntaxSection"
       value=".5 .1 .3 1" />
diff --git a/indra/newview/skins/vintage/xui/en/panel_script_ed.xml b/indra/newview/skins/vintage/xui/en/panel_script_ed.xml
index d99c9d408a..a13af7889e 100644
--- a/indra/newview/skins/vintage/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/vintage/xui/en/panel_script_ed.xml
@@ -330,8 +330,9 @@
      default_color="ScriptText"
      bg_writeable_color="ScriptBackground"
 	 bg_focus_color="ScriptBackground"
-     text_readonly_color="DkGray"
-     bg_readonly_color="TextBgWriteableColor"
+     text_readonly_color="ScriptText"
+     bg_readonly_color="ScriptBackground"
+     cursor_color="ScriptCursorColor"
      show_line_numbers="true"
      enable_tooltip_paste="true"
      width="487"
diff --git a/indra/newview/skins/vintage/xui/en/panel_script_ed_preproc.xml b/indra/newview/skins/vintage/xui/en/panel_script_ed_preproc.xml
index 48d5712707..06047c5985 100644
--- a/indra/newview/skins/vintage/xui/en/panel_script_ed_preproc.xml
+++ b/indra/newview/skins/vintage/xui/en/panel_script_ed_preproc.xml
@@ -354,6 +354,7 @@
 		 bg_focus_color="ScriptBackground"
 		 text_readonly_color="DkGray"
 		 bg_readonly_color="TextBgWriteableColor"
+		 cursor_color="ScriptCursorColor"
 		 width="487"
 		 show_line_numbers="true"
 		 enable_tooltip_paste="true"
@@ -387,8 +388,9 @@
 		 default_color="ScriptText"
 		 bg_writeable_color="ScriptBackground"
 		 bg_focus_color="ScriptBackground"
-		 text_readonly_color="DkGray"
-		 bg_readonly_color="TextBgWriteableColor"
+		 text_readonly_color="ScriptText"
+		 bg_readonly_color="ScriptBackground"
+		 cursor_color="ScriptCursorColor"
 		 width="487"
 		 show_line_numbers="true" 
 		 word_wrap="true">