diff --git a/indra/newview/llscripteditor.h b/indra/newview/llscripteditor.h
index 86c915d6a0a4284e84b1594603abccb642be5904..d3e18021f9a9c1a1fd0a401aa92a7e3437e67e34 100644
--- a/indra/newview/llscripteditor.h
+++ b/indra/newview/llscripteditor.h
@@ -32,7 +32,6 @@
 
 class LLScriptEditor : public LLTextEditor
 {
-	friend class LLUICtrlFactory;
 public:
 	
 	struct Params : public LLInitParam::Block<Params, LLTextEditor::Params>
@@ -48,6 +47,7 @@ class LLScriptEditor : public LLTextEditor
 	LLKeywords::keyword_iterator_t keywordsEnd()	{ return mKeywords.end(); }
 	
 protected:
+	friend class LLUICtrlFactory;
 	LLScriptEditor(const Params& p);
 	
 private:
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 1a4f0aff73119859aae3ee4d30136d77b51b520d..76a81c488505975dfb2306b71af4f8e17c58827e 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -149,7 +149,7 @@
         </menu>
     </menu_bar>
     <script_editor
-    left="0"
+     left="0"
      type="string"
      length="1"
      follows="left|top|right|bottom"
@@ -162,7 +162,9 @@
      text_readonly_color="DkGray"
      width="487"
      enable_tooltip_paste="true"
-     word_wrap="true">
+     word_wrap="true"
+     show_context_menu="true"
+     show_line_numbers="true">
         Loading...
     </script_editor>
     <scroll_list