From f9bbf9e30a24bb873252cd5f0dfe7dadeb7b4b22 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Tue, 13 May 2014 10:16:03 -0600
Subject: STORM-2028 - Show context menu in script editor

---
 indra/newview/llscripteditor.h                         | 2 +-
 indra/newview/skins/default/xui/en/panel_script_ed.xml | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llscripteditor.h b/indra/newview/llscripteditor.h
index 86c915d6a0..d3e18021f9 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 @@ public:
 	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 1a4f0aff73..76a81c4885 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
-- 
cgit v1.2.3