From c8711f4ea5d941d12ae7e6cf99302bfc3211dd3c Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 5 Sep 2023 22:22:56 +0300
Subject: Initial prototype of embedded LUA

---
 .../skins/default/xui/en/floater_lua_debug.xml     | 98 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml | 11 +++
 2 files changed, 109 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_lua_debug.xml

(limited to 'indra/newview/skins/default/xui/en')

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..7ed6c35151
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_lua_debug.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_minimize="false"
+ can_resize="false"
+ can_close="true"
+ bevel_style="in"
+ height="220"
+ layout="topleft"
+ name="LUA debug"
+ save_rect="true"
+ title="LUA DEBUG"
+ single_instance="true" 
+ width="530">
+    <text
+     type="string"
+     length="1"
+     follows="left|bottom"
+     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|bottom"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="10"
+     max_length_bytes="300"
+     name="lua_cmd"
+     select_on_focus="true"
+     top_delta="30"
+     width="415" />
+    <button
+     follows="left|bottom"
+     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="left|top"
+     width="495"
+     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"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="65"
+     max_length_bytes="300"
+     name="script_path"
+     select_on_focus="true"
+     top_delta="-2"
+     width="315" />
+    <button
+     follows="left|bottom"
+     height="25"
+     label="Browse..."
+     label_selected="Browse..."
+     layout="topleft"
+     left_pad="5"
+     name="browse_btn"
+     top_delta="-2"
+     width="75" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 810d3fddd5..89643189b5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2484,6 +2484,17 @@ function="World.EnvPreset"
                 function="Develop.SetTexFetchDebugger" />
             </menu_item_call>
           
+            <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>
             <menu_item_separator/>
 
             <menu_item_call
-- 
cgit v1.2.3


From 66f39dece85d38afb1d8272ca89112ea70e05494 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 15 Sep 2023 21:30:26 +0100
Subject: DRTVWR-589 - lua file browser added run button to allow re-running
 same script

---
 indra/newview/skins/default/xui/en/floater_lua_debug.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_lua_debug.xml b/indra/newview/skins/default/xui/en/floater_lua_debug.xml
index 7ed6c35151..05f4db009e 100644
--- a/indra/newview/skins/default/xui/en/floater_lua_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_lua_debug.xml
@@ -95,4 +95,14 @@
      name="browse_btn"
      top_delta="-2"
      width="75" />
+    <button
+     follows="left|bottom"
+     height="25"
+     label="Run"
+     label_selected="Run"
+     layout="topleft"
+     left_pad="5"
+     name="run_btn"
+     top_delta="-2"
+     width="50" />
 </floater>
-- 
cgit v1.2.3


From e3ba75101a94cff9b1409c58f796587cf2702f10 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 21 Sep 2023 14:41:00 +0300
Subject: DRTVWR-589 - adding menu items to the top menu

---
 indra/newview/skins/default/xui/en/floater_lua_debug.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_lua_debug.xml b/indra/newview/skins/default/xui/en/floater_lua_debug.xml
index 05f4db009e..0de26161e7 100644
--- a/indra/newview/skins/default/xui/en/floater_lua_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_lua_debug.xml
@@ -10,7 +10,7 @@
  save_rect="true"
  title="LUA DEBUG"
  single_instance="true" 
- width="530">
+ width="535">
     <text
      type="string"
      length="1"
@@ -37,7 +37,7 @@
      name="lua_cmd"
      select_on_focus="true"
      top_delta="30"
-     width="415" />
+     width="435" />
     <button
      follows="left|bottom"
      height="25"
@@ -55,7 +55,7 @@
      layout="topleft"
      name="result_text"
      follows="left|top"
-     width="495"
+     width="515"
      top_delta="40"
      word_wrap="true" />
     <text
@@ -84,7 +84,7 @@
      name="script_path"
      select_on_focus="true"
      top_delta="-2"
-     width="315" />
+     width="320" />
     <button
      follows="left|bottom"
      height="25"
@@ -94,7 +94,7 @@
      left_pad="5"
      name="browse_btn"
      top_delta="-2"
-     width="75" />
+     width="70" />
     <button
      follows="left|bottom"
      height="25"
@@ -103,6 +103,5 @@
      layout="topleft"
      left_pad="5"
      name="run_btn"
-     top_delta="-2"
      width="50" />
 </floater>
-- 
cgit v1.2.3


From de61551df3219dae2238591bae5fa7b6c857e6b0 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Sat, 30 Sep 2023 11:51:09 -0400
Subject: DRTVWR-589: Emulate print() better, show output on Lua floater.

Break out a lua_print_msg() function common to print_debug(), print_info() and
print_warning(). Instead of accepting a single argument, lua_print_msg()
accepts arbitrary arguments, passing each to the Lua tostring() function and
concatenating the results. In addition to returning the combined string to its
caller for level-appropriate logging, it also posts the message to a "lua
output" LLEventPump for any interested party.

Make LLFloaterLUADebug listen on "lua output" when the floater is constructed,
storing the connection in an LLTempBoundListener to stop listening when the
floater is destroyed. Append each message to the floater's output panel with a
line break.

Make LLTextEditor::addLineBreakChar() public. insertText("\n") only appends a
little rectangle glyph.

Enlarge the text capacity of the floater's output panel to be able to report
whatever messages a Lua script wants to print.

Add diagnostic logging for posting events from Lua, and receiving events to
forward to Lua.

Since lua_pop() is a macro implemented on lua_settop(), replace the awkward
construct lua_pop(L, lua_gettop(L)) with lua_settop(L, 0).

Use lambdas instead of std::bind() to connect LuaListener and LLLeapListener.
---
 indra/newview/skins/default/xui/en/floater_lua_debug.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_lua_debug.xml b/indra/newview/skins/default/xui/en/floater_lua_debug.xml
index 0de26161e7..f03739f7c2 100644
--- a/indra/newview/skins/default/xui/en/floater_lua_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_lua_debug.xml
@@ -55,6 +55,7 @@
      layout="topleft"
      name="result_text"
      follows="left|top"
+     max_length="65536" 
      width="515"
      top_delta="40"
      word_wrap="true" />
-- 
cgit v1.2.3