Merge branch 'project/lua_editor' into marchcat/devlinux-slua

# Conflicts:
#	indra/llcommon/llstl.h
#	indra/newview/app_settings/settings.xml

16 files changed, 232 insertions, 69 deletions

diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index 320db7f654..1d56e218eb 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -23,6 +23,8 @@ mit Open-Source-Beiträgen von:</text>
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW).
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+        luau Copyright (c) 1994–2019 Lua.org, PUC-Rio / Copyright (c) 2019-2024 Roblox Corporation
+        meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
         ogg/vorbis Copyright (C) 2002, Xiphophorus.
         OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
         PCRE Copyright (c) 1997-2012 University of Cambridge.
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 126cd84d56..4394f71260 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -105,6 +105,7 @@ Dummy Name replaced at run time
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+        luau Copyright (c) 1994–2019 Lua.org, PUC-Rio / Copyright (c) 2019-2024 Roblox Corporation
         meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
         ogg/vorbis Copyright (C) 2002, Xiphophorus
         OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index e30c519c8a..26281989a7 100644
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
@@ -7,7 +7,7 @@
   height="607"
   layout="topleft"
   min_height="271"
-  min_width="328"
+  min_width="500"
   name="script ed float"
   help_topic="script_ed_float"
   save_rect="true"
@@ -62,7 +62,6 @@
   </text>
   <panel
     bevel_style="none"
-     
     border_style="line"
     follows="left|top|right|bottom"
     height="499"
@@ -93,25 +92,15 @@
     name="running"
     width="205" />
   <check_box
-    left_delta="140"
-    enabled="true"
-    follows="left|bottom"
-    font="SansSerif"
-    height="18"
-    initial_value="true"
-    label="Mono"
+    width="130"
+    height="21"
+    enabled="false"
+    left="9"
+    top_pad="10"
     layout="topleft"
-    name="mono"
-    width="100" />
-  <check_box width="130"
-             height="21"
-             enabled="false"
-             left="9"
-             top_pad="10"
-             layout="topleft"
-             follows="bottom|left"
-             label="Use Experience:"
-             name="enable_xp"/>
+    follows="bottom|left"
+    label="Use Experience:"
+    name="enable_xp"/>
   <combo_box
     label=""
     top_pad="-21"
@@ -121,13 +110,14 @@
     follows="left|bottom|right"
     visible="false"
     name="Experiences..."/>
-  <button label="&gt;"
-          name="view_profile"
-          height="23"
-          width="23"
-          right="496"
-          layout="topleft"
-          top_pad="-23"
-          follows="right"
-          visible="false"/>
+  <button
+    label="&gt;"
+    name="view_profile"
+    height="23"
+    width="23"
+    right="496"
+    layout="topleft"
+    top_pad="-23"
+    follows="right"
+    visible="false"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml
index b0b105fe58..f82224cc9e 100644
--- a/indra/newview/skins/default/xui/en/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml
@@ -5,7 +5,7 @@
  height="593"
  layout="topleft"
  min_height="271"
- min_width="320"
+ min_width="500"
  name="preview lsl text"
  help_topic="preview_lsl_text"
  save_rect="true"
diff --git a/indra/newview/skins/default/xui/en/floater_script_queue.xml b/indra/newview/skins/default/xui/en/floater_script_queue.xml
index a98437ab1d..e272d3073a 100644
--- a/indra/newview/skins/default/xui/en/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_queue.xml
@@ -37,6 +37,10 @@
      name="LoadingObjInv">
         Loading inventory for: [OBJECT_NAME]
     </floater.string>
+    <floater.string
+     name="SkippingSluaScript">
+        Skipping SLua script "[SCRIPT_NAME]" (cannot recompile to [TARGET])
+    </floater.string>
     <button
      follows="right|bottom"
      height="24"
diff --git a/indra/newview/skins/default/xui/en/floater_scripting_settings.xml b/indra/newview/skins/default/xui/en/floater_scripting_settings.xml
new file mode 100644
index 0000000000..07f073edb2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_scripting_settings.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+  legacy_header_height="18"
+  height="265"
+  layout="topleft"
+  name="floater_scripting_settings"
+  help_topic="scripting_settings"
+  save_rect="true"
+  title="SCRIPT DEVELOPMENT SETTINGS"
+  width="485">
+  <check_box
+    control_name="ShowScriptErrors"
+    follows="left|top"
+    height="20"
+    label="Show script errors in:"
+    layout="topleft"
+    left="30"
+    top_pad="20"
+    name="show_script_errors"
+    width="256" />
+  <radio_group
+    enabled_control="ShowScriptErrors"
+    control_name="ShowScriptErrorsLocation"
+    follows="top|left"
+    height="16"
+    layout="topleft"
+    left_delta="50"
+    name="show_location"
+    top_pad="5"
+    width="364">
+      <radio_item
+        height="16"
+        label="Nearby chat"
+        layout="topleft"
+        left="3"
+        name="0"
+        top="0"
+        width="315" />
+      <radio_item
+        height="16"
+        label="Separate window"
+        layout="topleft"
+        left_delta="175"
+        name="1"
+        top_delta="0"
+        width="315" />
+  </radio_group>
+
+  <text
+    follows="top|left|right"
+    height="15"
+    layout="topleft"
+    left="30"
+    name="tip"
+    top_pad="20"
+    width="330"
+    wrap="true">
+    External Script Editor:
+  </text>
+  <line_editor
+    control_name="ExternalEditor"
+    follows="top|left"
+    height="20"
+    initial_value=""
+    layout="left"
+    left_pad="5"
+    name="external_editor"
+    top_delta="25"
+    value=""
+    width="360" />
+  <button
+    follows="left|top"
+    height="20"
+    label="Browse..."
+    layout="topleft"
+    left_pad="5"
+    name="browse_btn"
+    top_delta="0"
+    width="70">
+    <button.commit_callback
+	    function="ScriptingSettings.BROWSE" />
+  </button>
+
+  <check_box
+    control_name="ExternalWebsocketSyncEnable"
+    follows="top|left"
+    height="20"
+    label="Enable WebSocket Sync"
+    layout="topleft"
+    left="30"
+    name="websocket_sync_enable"
+    top_pad="20"
+    width="200" />
+
+  <text
+    enabled_control="ExternalWebsocketSyncEnable"
+    follows="top|left"
+    height="15"
+    layout="topleft"
+    left="50"
+    name="websocket_tip"
+    top_pad="10"
+    width="140"
+    wrap="false">
+    WebSocket Listen Port:
+  </text>
+  <line_editor
+    enabled_control="ExternalWebsocketSyncEnable"
+    control_name="ExternalWebsocketSyncPort"
+    follows="top|left"
+    height="20"
+    initial_value="9020"
+    layout="topleft"
+    left_pad="5"
+    name="websocket_port"
+    top_delta="-2"
+    value="9020"
+    width="120" />
+  <check_box
+    control_name="ExternalWebsocketForwardDebug"
+    enabled_control="ExternalWebsocketSyncEnable"
+    follows="top|left"
+    height="20"
+    label="Forward script errors and debug to WebSocket clients"
+    layout="topleft"
+    left="50"
+    name="websocket_forward_debug"
+    top_pad="5"
+    width="400" />
+
+  <button
+    follows="left|top"
+    height="23"
+    label="Close"
+    layout="topleft"
+    right="-10"
+    name="close_btn"
+    top="-30"
+    width="100">
+    <button.commit_callback
+	    function="ScriptingSettings.CLOSE" />
+  </button>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 86999b1afb..434ee1db35 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -169,43 +169,6 @@
    name="hud_scale_slider"
    top_pad="-14"
    width="250" />
-    <check_box
-     control_name="ShowScriptErrors"
-     follows="left|top"
-     height="20"
-     label="Show script errors in:"
-     layout="topleft"
-     left="30"
-     top_pad="10" 
-     name="show_script_errors"
-     width="256" />
-    <radio_group
-     enabled_control="ShowScriptErrors"
-     control_name="ShowScriptErrorsLocation"
-     follows="top|left"
-     height="16"
-     layout="topleft"
-     left_delta="50"
-     name="show_location"
-     top_pad="5"
-     width="364">
-        <radio_item
-         height="16"
-         label="Nearby chat"
-         layout="topleft"
-         left="3"
-         name="0"
-         top="0"
-         width="315" />
-        <radio_item
-         height="16"
-         label="Separate window"
-         layout="topleft"
-         left_delta="175"
-         name="1"
-         top_delta="0"
-         width="315" />
-    </radio_group>
 
     <check_box
      control_name="AllowMultipleViewers"
@@ -266,9 +229,21 @@
      name="default_creation_permissions"
      height="20"
      left="30"
-     top_pad="16"
+     top_pad="10"
      width="200">
     <button.commit_callback
      function="Pref.PermsDefault" />
   </button>
+  <button
+    follows="top|left"
+    layout="topleft"
+    label="Script Development"
+    name="scripting_development"
+    height="20"
+    left="30"
+    top_pad="10"
+    width="200">
+    <button.commit_callback
+      function="Pref.Scripting" />
+  </button>
 </panel>
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 f8761d2b24..2ccf379b8d 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -219,7 +219,7 @@
     label="Save"
     label_selected="Save"
     layout="topleft"
-    top_pad="-35"
+    top_pad="-23"
      right="487"
     name="Save_btn"
     width="81" />
@@ -233,4 +233,37 @@
      right="400"
     name="Edit_btn"
     width="81" />
+  <combo_box
+    name="compile_target"
+    follows="right|bottom"
+    height="23"
+    layout="topleft"
+    top_pad="-23"
+     right="300"
+    width="140">
+    <combo_box.item
+      label="LSL: Legacy (LSO2)"
+      name="compile_target_lsl2"
+      value="lsl2" />
+    <combo_box.item
+      label="LSL: Mono"
+      name="compile_target_mono"
+      value="mono" />
+    <combo_box.item
+      label="LSL: 2025 VM"
+      name="compile_target_lsl_luau"
+      value="lsl-luau" />
+    <combo_box.item
+      label="SLua"
+      name="compile_target_luau"
+      value="luau" />
+  </combo_box>
+  <text
+    name="compile_target_label"
+    follows="right|bottom"
+    layout="topleft"
+    top_pad="-39"
+    width="90">
+      Compiler:
+  </text>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 8103a95376..08e0ed4557 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -23,6 +23,8 @@ con contribuciones de código abierto de:</text>
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+        luau Copyright (c) 1994–2019 Lua.org, PUC-Rio / Copyright (c) 2019-2024 Roblox Corporation
+        meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
         ogg/vorbis Copyright (C) 2002, Xiphophorus
         OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
         PCRE Copyright (c) 1997-2012 University of Cambridge
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index b6ea621177..7c6ae22fdf 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -23,6 +23,8 @@ avec les contributions Open Source de :</text>
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+        luau Copyright (c) 1994–2019 Lua.org, PUC-Rio / Copyright (c) 2019-2024 Roblox Corporation
+        meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
         ogg/vorbis Copyright (C) 2002, Xiphophorus
         OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
         PCRE Copyright (c) 1997-2012 University of Cambridge
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index 77be47d749..2bba6a4fad 100644
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -23,6 +23,8 @@ con contributi open source da:</text>
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+        luau Copyright (c) 1994–2019 Lua.org, PUC-Rio / Copyright (c) 2019-2024 Roblox Corporation
+        meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
         ogg/vorbis Copyright (C) 2002, Xiphophorus
         OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
         PCRE Copyright (c) 1997-2012 University of Cambridge
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 6cd22f6a31..dd24a04aed 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -27,6 +27,7 @@ google-perftools Copyright (c) 2005, Google Inc.
 Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
 jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
 jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+luau Copyright (c) 1994–2019 Lua.org, PUC-Rio / Copyright (c) 2019-2024 Roblox Corporation
 meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
 ogg/vorbis Copyright (C) 2002, Xiphophorus
 OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index 0e95c53109..f7dff635a7 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -23,6 +23,8 @@ com contribuições de código aberto de:</text>
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+        luau Copyright (c) 1994–2019 Lua.org, PUC-Rio / Copyright (c) 2019-2024 Roblox Corporation
+        meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
         ogg/vorbis Copyright (C) 2002, Xiphophorus
         OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
         PCRE Copyright (c) 1997-2012 University of Cambridge
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
index 22827bc397..435d242018 100644
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -24,6 +24,8 @@
         jpeg2000 (C) 2001, David Taubman, Университет Нового Южного Уэльса (UNSW)
         jpeglib (C) 1991-1998, Thomas G. Lane.
         ogg/vorbis (C) 2002, Xiphophorus
+        luau Copyright (c) 1994–2019 Lua.org, PUC-Rio / Copyright (c) 2019-2024 Roblox Corporation
+        meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
         OpenSSL (C) 1998-2008 The OpenSSL Project.
         PCRE (c) 1997-2012, Кембриджский университет
         SDL (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index ca21bee464..d01d0e88d3 100644
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -23,6 +23,8 @@ açık kaynak kod katkısında bulunanlar şunlardır:</text>
         Havok.com(TM) Telif Hakkı (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Telif Hakkı (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Telif Hakkı (C) 1991-1998, Thomas G. Lane.
+        luau Copyright (c) 1994–2019 Lua.org, PUC-Rio / Copyright (c) 2019-2024 Roblox Corporation
+        meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
         ogg/vorbis Telif Hakkı (C) 2002, Xiphophorus
         OpenSSL Telif Hakkı (C) 1998-2008 The OpenSSL Project.
         PCRE Telif Hakkı (c) 1997-2012 University of Cambridge
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 727f598894..4c23beca30 100644
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -23,6 +23,8 @@
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+        luau Copyright (c) 1994–2019 Lua.org, PUC-Rio / Copyright (c) 2019-2024 Roblox Corporation
+        meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine
         ogg/vorbis Copyright (C) 2002, Xiphophorus
         OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
         PCRE Copyright (c) 1997-2012 University of Cambridge