Merge pull request #2534 from secondlife/release/luau-scripting

Add Lua scripting to develop, behind feature flag

6 files changed, 229 insertions, 4 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_lua_debug.xml b/indra/newview/skins/default/xui/en/floater_lua_debug.xml
new file mode 100644
index 0000000000..15027f1647
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_lua_debug.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_minimize="false"
+ can_resize="true"
+ can_close="true"
+ bevel_style="in"
+ height="220"
+ layout="topleft"
+ name="LUA debug"
+ save_rect="true"
+ title="LUA DEBUG"
+ single_instance="true" 
+ width="535">
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="30"
+     layout="topleft"
+     left="10"
+     left_delta="10"
+     name="editor_path_label"
+     top="10"
+     width="100">
+      LUA string:
+    </text>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|top|right"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="10"
+     max_length_bytes="300"
+     name="lua_cmd"
+     select_on_focus="true"
+     top_delta="30"
+     width="435" />
+    <button
+     follows="right|top"
+     height="25"
+     label="Execute"
+     layout="topleft"
+     left_pad="5"
+     name="execute_btn"
+     top_delta="-2"
+     width="75" />
+
+    <text_editor
+     enabled="false"
+     left="10"
+     height="95"
+     layout="topleft"
+     name="result_text"
+     follows="all"
+     max_length="65536" 
+     width="515"
+     top_delta="40"
+     word_wrap="true" />
+    <text
+     type="string"
+     length="1"
+     follows="left|bottom"
+     font="SansSerif"
+     height="30"
+     layout="topleft"
+     left="10"
+     name="path_label"
+     top_pad="15"
+     width="100">
+        File Path:
+    </text>
+    <line_editor
+     border_style="line"
+     enabled="false"
+     border_thickness="1"
+     follows="left|bottom|right"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="65"
+     max_length_bytes="300"
+     name="script_path"
+     select_on_focus="true"
+     top_delta="-2"
+     width="320" />
+    <button
+     follows="right|bottom"
+     height="25"
+     label="Browse..."
+     label_selected="Browse..."
+     layout="topleft"
+     left_pad="5"
+     name="browse_btn"
+     top_delta="-2"
+     width="70" />
+    <button
+     follows="right|bottom"
+     height="25"
+     label="Run"
+     label_selected="Run"
+     layout="topleft"
+     left_pad="5"
+     name="run_btn"
+     width="50" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_lua_scripts.xml b/indra/newview/skins/default/xui/en/floater_lua_scripts.xml
new file mode 100644
index 0000000000..6859201650
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_lua_scripts.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_minimize="false"
+ can_resize="true"
+ can_close="true"
+ bevel_style="in"
+ height="220"
+ min_height="220"
+ layout="topleft"
+ name="LUA scripts"
+ save_rect="true"
+ title="LUA Scripts"
+ single_instance="true" 
+ width="555"
+ min_width="555">
+    <scroll_list
+      column_padding="0"
+      draw_stripes="true"
+      draw_heading="true"
+      height="200"
+      left="10"
+      follows="all"
+      layout="topleft"
+      sort_column="script_name"
+      name="scripts_list"
+      top_pad="10"
+      width="535">
+        <scroll_list.columns
+         label="Name"
+         name="script_name"
+         width="180" />
+        <scroll_list.columns
+         label="Path"
+         name="script_path"/>
+    </scroll_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
index a93be6a18d..0b8190df7e 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
@@ -43,6 +43,20 @@
      label="Setting"
      name="setting" />
   </scroll_list>
+  <button
+   follows="right|bottom"
+   layout="topleft"
+   image_hover_unselected="Toolbar_Middle_Over"
+   image_overlay="Icon_Copy"
+   image_selected="Toolbar_Middle_Selected"
+   image_unselected="Toolbar_Middle_Off"
+   name="copy_btn"
+   tool_tip="Copy to clipboard"
+   top_delta="8"
+   left_pad="10"
+   visible="false"
+   height="20"
+   width="20" />
   <text
    type="string"
    length="1"
@@ -51,12 +65,11 @@
    layout="topleft"
    name="setting_name_txt"
    font="SansSerifSmallBold"
-   top_delta="8"
-   left_pad="10"
+   left_pad="4"
    visible="false"
    use_ellipses="true"
    text_color="White"
-   width="240">
+   width="225">
     Debug setting name
   </text>
   <text_editor
@@ -67,6 +80,7 @@
    name="comment_text"
    follows="left|top"
    width="240"
+   left="320"
    top_delta="20"
    word_wrap="true" />
   <radio_group
@@ -198,4 +212,15 @@
       name="hide_default"
       width="330">
     </check_box>
+    <text_editor
+      read_only="true"
+      visible="false"
+      height="115"
+      layout="topleft"
+      name="llsd_text"
+      follows="left|top"
+      width="240"
+      left="320"
+      top="180"
+      word_wrap="true" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_lua_scripts.xml b/indra/newview/skins/default/xui/en/menu_lua_scripts.xml
new file mode 100644
index 0000000000..645fee405d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_lua_scripts.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ name="Scripts">
+  <menu_item_call
+   label="Open Containing Folder"
+   layout="topleft"
+   name="open_folder">
+    <menu_item_call.on_click
+     function="Script.OpenFolder" />
+  </menu_item_call>
+  <menu_item_separator/>
+  <menu_item_call
+   label="Terminate script"
+   layout="topleft"
+   name="terminate">
+    <menu_item_call.on_click
+     function="Script.Terminate" />
+   </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 13ce886fb9..43cdf30ba0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2583,6 +2583,37 @@ function="World.EnvPreset"
                parameter="scene monitor" />
             </menu_item_check>
             <menu_item_separator/>
+            <menu_item_check
+               label="LUA Debug Console"
+               name="LUA Debug Console">
+              <menu_item_check.on_check
+               function="Floater.Visible"
+               parameter="lua_debug" />
+              <menu_item_check.on_click
+               function="Floater.Toggle"
+               parameter="lua_debug" />
+              <menu_item_check.on_visible
+               function="CheckControl"
+               parameter="LuaFeature" />
+            </menu_item_check>
+            <menu_item_check
+               label="LUA Scripts Info"
+               name="LUA Scripts">
+              <menu_item_check.on_check
+               function="Floater.Visible"
+               parameter="lua_scripts" />
+              <menu_item_check.on_click
+               function="Floater.Toggle"
+               parameter="lua_scripts" />
+              <menu_item_check.on_visible
+               function="CheckControl"
+               parameter="LuaFeature" />
+            </menu_item_check>
+            <menu_item_separator>
+              <menu_item_separator.on_visible
+               function="CheckControl"
+               parameter="LuaFeature"/>
+            </menu_item_separator>
 
             <menu_item_call
              label="Region Info to Debug Console"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2d04b3e0fe..effd19b708 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -534,7 +534,9 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="ChangeYourDefaultAnimations">Change your default animations</string>
 	<string name="ForceSitAvatar">Force your avatar to sit</string>
 	<string name="ChangeEnvSettings">Change your environment settings</string>
-	
+	<string name="ScriptBy" value="Script by "/>
+	<string name="ScriptStr" value="Script: "/>
+
 	<string name="NotConnected">Not Connected</string>
 	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
 	<string name="JoinAnExperience"/><!-- intentionally blank -->
@@ -4027,6 +4029,10 @@ Please check http://status.secondlifegrid.net to see if there is a known problem
   <string name="DeleteItem">Delete selected item?</string>
 
   <string name="EmptyOutfitText">There are no items in this outfit</string>
+  <string name="OutfitNotFound" value="Couldn't find outfit "/>
+  <string name="OutfitNotAdded" value="Can't add to COF outfit "/>
+  <string name="OutfitNotReplaced" value="Can't replace COF with outfit "/>
+  <string name="SystemFolderNotWorn" value="Can't wear system folder "/>
 
  <!-- External editor status codes -->
  <string name="ExternalEditorNotSet">Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.