1 files changed, 104 insertions, 0 deletions
diff --git a/indra/newview/lluilistener.cpp b/indra/newview/lluilistener.cpp
index 4afd7f1766..c73c93859a 100644
--- a/indra/newview/lluilistener.cpp
+++ b/indra/newview/lluilistener.cpp
@@ -34,10 +34,13 @@
 // std headers
 // external library headers
 // other Linden headers
+#include "llmenugl.h"
 #include "llui.h" // getRootView(), resolvePath()
 #include "lluictrl.h"
 #include "llerror.h"
 
+extern LLMenuBarGL* gMenuBarView;
+
 #define THROTTLE_PERIOD 1.5 // required seconds between throttled functions
 #define MIN_THROTTLE 0.5
 
@@ -57,6 +60,31 @@ LLUIListener::LLUIListener():
         "current value as [\"value\"] reply.",
         &LLUIListener::getValue,
         llsd::map("path", LLSD(), "reply", LLSD()));
+
+    LLSD required_args = llsd::map("name", LLSD(), "label", LLSD(), "reply", LLSD());
+    add("addMenu",
+        "Add new drop-down menu [\"name\"] with displayed [\"label\"] to the Top menu.",
+        &LLUIListener::addMenu,
+        required_args);
+
+    required_args.insert("parent_menu", LLSD());
+    add("addMenuBranch",
+        "Add new menu branch [\"name\"] with displayed [\"label\"]\n"
+        "to the [\"parent_menu\"] within the Top menu.",
+        &LLUIListener::addMenuBranch,
+        required_args);
+
+    add("addMenuItem",
+        "Add new menu item [\"name\"] with displayed [\"label\"]\n"
+        "and call-on-click UI function [\"func\"] with optional [\"param\"]\n"
+        "to the [\"parent_menu\"] within the Top menu.",
+        &LLUIListener::addMenuItem,
+        required_args.with("func", LLSD()));
+    
+    add("addMenuSeparator",
+        "Add menu separator to the [\"parent_menu\"] within the Top menu.",
+        &LLUIListener::addMenuSeparator,
+        llsd::map("parent_menu", LLSD(), "reply", LLSD()));
 }
 
 typedef LLUICtrl::CommitCallbackInfo cb_info;
@@ -120,3 +148,79 @@ void LLUIListener::getValue(const LLSD&event) const
         response.error(stringize("UI control ", std::quoted(event["path"].asString()), " was not found"));
     }
 }
+
+LLMenuGL::Params get_params(const LLSD&event)
+{
+    LLMenuGL::Params item_params;
+    item_params.name  = event["name"];
+    item_params.label = event["label"];
+    item_params.can_tear_off = true;
+    return item_params;
+}
+
+LLMenuGL* get_parent_menu(LLEventAPI::Response& response, const LLSD&event)
+{
+    LLMenuGL* parent_menu = gMenuBarView->findChildMenuByName(event["parent_menu"], true);
+    if(!parent_menu)
+    {
+        response.error(stringize("Parent menu ", std::quoted(event["parent_menu"].asString()), " was not found"));
+    }
+    return parent_menu;
+}
+
+void LLUIListener::addMenu(const LLSD&event) const
+{
+    Response response(LLSD(), event);
+    LLMenuGL::Params item_params = get_params(event);
+    if(!gMenuBarView->appendMenu(LLUICtrlFactory::create<LLMenuGL>(item_params)))
+    {
+        response.error(stringize("Menu ", std::quoted(event["name"].asString()), " was not added"));
+    }
+}
+
+void LLUIListener::addMenuBranch(const LLSD&event) const
+{
+    Response response(LLSD(), event);
+    if(LLMenuGL* parent_menu = get_parent_menu(response, event))
+    {
+        LLMenuGL::Params item_params = get_params(event);
+        if(!parent_menu->appendMenu(LLUICtrlFactory::create<LLMenuGL>(item_params)))
+        {
+            response.error(stringize("Menu branch ", std::quoted(event["name"].asString()), " was not added"));
+        }
+    }
+}
+
+void LLUIListener::addMenuItem(const LLSD&event) const
+{
+    Response response(LLSD(), event);
+    LLMenuItemCallGL::Params item_params;
+    item_params.name  = event["name"];
+    item_params.label = event["label"];
+    LLUICtrl::CommitCallbackParam item_func;
+    item_func.function_name = event["func"];
+    if (event.has("param"))
+    {
+        item_func.parameter = event["param"];
+    }
+    item_params.on_click = item_func;
+    if(LLMenuGL* parent_menu = get_parent_menu(response, event))
+    {
+        if(!parent_menu->append(LLUICtrlFactory::create<LLMenuItemCallGL>(item_params)))
+        {
+            response.error(stringize("Menu item ", std::quoted(event["name"].asString()), " was not added"));
+        }
+    }
+}
+
+void LLUIListener::addMenuSeparator(const LLSD&event) const
+{
+    Response response(LLSD(), event);
+    if(LLMenuGL* parent_menu = get_parent_menu(response, event))
+    {
+        if(!parent_menu->addSeparator())
+        {
+            response.error("Separator was not added");
+        }
+    }
+}