1 files changed, 33 insertions, 7 deletions

diff --git a/indra/llui/llluafloater.cpp b/indra/llui/llluafloater.cpp
index afc287a864..268075b05d 100644
--- a/indra/llui/llluafloater.cpp
+++ b/indra/llui/llluafloater.cpp
@@ -32,6 +32,7 @@
 #include "llcheckboxctrl.h"
 #include "llcombobox.h"
 #include "llscrolllistctrl.h"
+#include "lltexteditor.h"
 
 const std::string LISTENER_NAME("LLLuaFloater");
 
@@ -45,7 +46,8 @@ std::set<std::string> EVENT_LIST = {
     "right_mouse_down",
     "right_mouse_up",
     "post_build",
-    "floater_close"
+    "floater_close",
+    "keystroke"
 };
 
 LLLuaFloater::LLLuaFloater(const LLSD &key) :
@@ -99,6 +101,16 @@ LLLuaFloater::LLLuaFloater(const LLSD &key) :
         }
     }, requiredParams);
 
+    mDispatchListener.add("add_text", "", [this](const LLSD &event) 
+    { 
+        LLTextEditor *editor = getChild<LLTextEditor>(event["ctrl_name"].asString());
+        if (editor) 
+        {
+            editor->pasteTextWithLinebreaks(stringize(event["value"]));
+            editor->addLineBreakChar(true);
+        }
+    }, requiredParams);
+
     mDispatchListener.add("set_title", "", [this](const LLSD &event) 
     { 
         setTitle(event["value"].asString());
@@ -182,6 +194,12 @@ void LLLuaFloater::registerCallback(const std::string &ctrl_name, const std::str
         post(event.with("x", x).with("y", y)); 
     };
 
+    auto post_with_value = [this, data](LLSD value)
+    {
+        LLSD event(data);
+        post(event.with("value", value));
+    };
+
     if (event_is(event, "mouse_enter"))
     {
         ctrl->setMouseEnterCallback(mouse_event_cb);
@@ -211,18 +229,26 @@ void LLLuaFloater::registerCallback(const std::string &ctrl_name, const std::str
         LLScrollListCtrl *list = dynamic_cast<LLScrollListCtrl *>(ctrl);
         if (list)
         {
-            list->setDoubleClickCallback(
-                [this, data, list]()
-                {
-                    LLSD event(data);
-                    post(event.with("value", list->getCurrentID()));
-                });
+            list->setDoubleClickCallback( [post_with_value, list](){ post_with_value(LLSD(list->getCurrentID())); });
         }
         else 
         {
             ctrl->setDoubleClickCallback(mouse_event_coords_cb);
         }
     }
+    else if (event_is(event, "keystroke")) 
+    {
+        LLTextEditor* text_editor = dynamic_cast<LLTextEditor*>(ctrl);
+        if (text_editor)
+        {
+            text_editor->setKeystrokeCallback([post_with_value](LLTextEditor *editor) { post_with_value(editor->getValue()); });
+        }
+        LLLineEditor* line_editor = dynamic_cast<LLLineEditor*>(ctrl);
+        if (line_editor)
+        {
+            line_editor->setKeystrokeCallback([post_with_value](LLLineEditor *editor, void* userdata) { post_with_value(editor->getValue()); }, NULL);
+        }
+    }
     else 
     {
         LL_WARNS("LuaFloater") << "Can't register callback for unknown event: " << event << " , control: " << ctrl_name << LL_ENDL;