From 99307b619a5aa27bef3bb67027c4cb5e54f21ad4 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 2 Aug 2024 19:46:52 +0300
Subject: Lua api for adjusting toolbars

---
 indra/newview/lluilistener.cpp           | 68 ++++++++++++++++++++++++++++++++
 indra/newview/lluilistener.h             |  6 +++
 indra/newview/scripts/lua/require/UI.lua | 30 ++++++++++++++
 3 files changed, 104 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/lluilistener.cpp b/indra/newview/lluilistener.cpp
index b81859a764..6d1d5ac735 100644
--- a/indra/newview/lluilistener.cpp
+++ b/indra/newview/lluilistener.cpp
@@ -35,6 +35,7 @@
 // external library headers
 // other Linden headers
 #include "llmenugl.h"
+#include "lltoolbarview.h"
 #include "llui.h" // getRootView(), resolvePath()
 #include "lluictrl.h"
 #include "llerror.h"
@@ -97,6 +98,32 @@ LLUIListener::LLUIListener():
         "Add menu separator to the [\"parent_menu\"] within the Top menu.",
         &LLUIListener::addMenuSeparator,
         llsd::map("parent_menu", LLSD(), "reply", LLSD()));
+
+    add("defaultToolbars",
+        "todo: defaultToolbars desc",
+        &LLUIListener::restoreDefaultToolbars);
+
+    add("clearToolbars",
+        "Clear all buttons off the toolbars",
+        &LLUIListener::clearAllToolbars);
+
+    add("addToolbarBtn",
+        "Add [\"btn_name\"] toolbar button to the [\"toolbar\"]\n"
+        "[1 (left toolbar), 2 (right toolbar), 3 (bottom toolbar)]\n"
+        "Position of the command in the original list can be specified as [\"rank\"]",
+        &LLUIListener::addToolbarBtn,
+        llsd::map("btn_name", LLSD(), "reply", LLSD()));
+
+    add("removeToolbarBtn",
+        "Remove [\"btn_name\"] toolbar button off the toolbar,\n"
+        "return [\"rank\"] (old position) of the command in the original list",
+        &LLUIListener::removeToolbarBtn,
+        llsd::map("btn_name", LLSD(), "reply", LLSD()));
+
+    add("getToolbarBtnNames",
+        "Return the table of Toolbar buttons names",
+        &LLUIListener::getToolbarBtnNames,
+        llsd::map("reply", LLSD()));
 }
 
 typedef LLUICtrl::CommitCallbackInfo cb_info;
@@ -280,3 +307,44 @@ void LLUIListener::addMenuSeparator(const LLSD&event) const
         }
     }
 }
+
+void LLUIListener::restoreDefaultToolbars(const LLSD &event) const
+{
+    LLToolBarView::loadDefaultToolbars();
+}
+
+void LLUIListener::clearAllToolbars(const LLSD &event) const
+{
+    LLToolBarView::clearAllToolbars();
+}
+
+void LLUIListener::addToolbarBtn(const LLSD &event) const
+{
+    Response response(LLSD(), event);
+
+    typedef LLToolBarEnums::EToolBarLocation ToolBarLocation;
+    ToolBarLocation toolbar = ToolBarLocation::TOOLBAR_BOTTOM;
+    if (event.has("toolbar"))
+    {
+        toolbar = llclamp((ToolBarLocation)event["toolbar"].asInteger(), ToolBarLocation::TOOLBAR_NONE, ToolBarLocation::TOOLBAR_BOTTOM);
+    }
+    S32 rank = event.has("rank") ? event["rank"].asInteger() : - 1;
+    if(!gToolBarView->addCommand(event["btn_name"].asString(), toolbar, rank))
+    {
+        response.error(stringize("Toolbar button ", std::quoted(event["btn_name"].asString()), " was not found"));
+    }
+}
+
+void LLUIListener::removeToolbarBtn(const LLSD &event) const
+{
+    Response response(LLSD(), event);
+
+    S32 old_rank = LLToolBar::RANK_NONE;
+    gToolBarView->removeCommand(event["btn_name"].asString(), old_rank);
+    response["rank"] = old_rank;
+}
+
+void LLUIListener::getToolbarBtnNames(const LLSD &event) const
+{
+    Response response(llsd::map("cmd_names", LLCommandManager::instance().getCommandNames()), event);
+}
diff --git a/indra/newview/lluilistener.h b/indra/newview/lluilistener.h
index 671eb5f29b..f4bee00807 100644
--- a/indra/newview/lluilistener.h
+++ b/indra/newview/lluilistener.h
@@ -50,6 +50,12 @@ private:
     void addMenuItem(const LLSD&event) const;
     void addMenuSeparator(const LLSD&event) const;
 
+    void restoreDefaultToolbars(const LLSD &event) const;
+    void clearAllToolbars(const LLSD &event) const;
+    void addToolbarBtn(const LLSD &event) const;
+    void removeToolbarBtn(const LLSD &event) const;
+    void getToolbarBtnNames(const LLSD &event) const;
+
     F64 mLastUntrustedThrottle {0};
     F64 mLastMinThrottle {0};
 };
diff --git a/indra/newview/scripts/lua/require/UI.lua b/indra/newview/scripts/lua/require/UI.lua
index 06b49c6269..30b7189c3c 100644
--- a/indra/newview/scripts/lua/require/UI.lua
+++ b/indra/newview/scripts/lua/require/UI.lua
@@ -169,4 +169,34 @@ function UI.addMenuSeparator(...)
     return leap.request('UI', args)
 end
 
+-- ***************************************************************************
+--  Toolbar buttons
+-- ***************************************************************************
+-- Clears all buttons off the toolbars
+function UI.clearToolbars()
+    leap.send('UI', {op='clearToolbars'})
+end
+
+function UI.defaultToolbars()
+    leap.send('UI', {op='defaultToolbars'})
+end
+
+-- UI.addToolbarBtn{btn_name=btn_name
+--          [, toolbar= 3] -- 1 [TOOLBAR_LEFT], 2 [TOOLBAR_RIGHT], 3 [TOOLBAR_BOTTOM]
+--          [, rank=1]} -- position on the toolbar
+function UI.addToolbarBtn(...)
+    local args = mapargs('btn_name,toolbar,rank', ...)
+    args.op = 'addToolbarBtn'
+    return leap.request('UI', args)
+end
+
+-- Returns the rank(position) of the command in the original list
+function UI.removeToolbarBtn(btn_name)
+    return leap.request('UI', {op = 'removeToolbarBtn', btn_name=btn_name}).rank
+end
+
+function UI.getToolbarBtnNames()
+    return leap.request('UI', {op = 'getToolbarBtnNames'}).cmd_names
+end
+
 return UI
-- 
cgit v1.2.3


From a67a01240cbd58a1800290294be83e7b874fefb6 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 2 Aug 2024 20:19:53 +0300
Subject: Lua api for showing/hiding floater; rename demo scripts

---
 indra/newview/lluilistener.cpp                     | 10 ++++++
 indra/newview/lluilistener.h                       |  2 ++
 indra/newview/scripts/lua/require/UI.lua           | 23 +++++++++++++
 indra/newview/scripts/lua/test_luafloater_demo.lua | 39 ++++++++++++++++++++++
 .../newview/scripts/lua/test_luafloater_demo2.lua  | 39 ----------------------
 .../scripts/lua/test_luafloater_gesture_list.lua   | 27 +++++++++++++++
 .../scripts/lua/test_luafloater_gesture_list2.lua  | 27 ---------------
 7 files changed, 101 insertions(+), 66 deletions(-)
 create mode 100644 indra/newview/scripts/lua/test_luafloater_demo.lua
 delete mode 100644 indra/newview/scripts/lua/test_luafloater_demo2.lua
 create mode 100644 indra/newview/scripts/lua/test_luafloater_gesture_list.lua
 delete mode 100644 indra/newview/scripts/lua/test_luafloater_gesture_list2.lua

(limited to 'indra/newview')

diff --git a/indra/newview/lluilistener.cpp b/indra/newview/lluilistener.cpp
index 6d1d5ac735..07a8b45f89 100644
--- a/indra/newview/lluilistener.cpp
+++ b/indra/newview/lluilistener.cpp
@@ -39,6 +39,7 @@
 #include "llui.h" // getRootView(), resolvePath()
 #include "lluictrl.h"
 #include "llerror.h"
+#include "llviewermenufile.h" // close_all_windows()
 
 extern LLMenuBarGL* gMenuBarView;
 
@@ -124,6 +125,10 @@ LLUIListener::LLUIListener():
         "Return the table of Toolbar buttons names",
         &LLUIListener::getToolbarBtnNames,
         llsd::map("reply", LLSD()));
+
+    add("closeAllFloaters",
+        "Close all the floaters",
+        &LLUIListener::closeAllFloaters);
 }
 
 typedef LLUICtrl::CommitCallbackInfo cb_info;
@@ -348,3 +353,8 @@ void LLUIListener::getToolbarBtnNames(const LLSD &event) const
 {
     Response response(llsd::map("cmd_names", LLCommandManager::instance().getCommandNames()), event);
 }
+
+void LLUIListener::closeAllFloaters(const LLSD &event) const
+{
+    close_all_windows();
+}
diff --git a/indra/newview/lluilistener.h b/indra/newview/lluilistener.h
index f4bee00807..bae6724b3d 100644
--- a/indra/newview/lluilistener.h
+++ b/indra/newview/lluilistener.h
@@ -56,6 +56,8 @@ private:
     void removeToolbarBtn(const LLSD &event) const;
     void getToolbarBtnNames(const LLSD &event) const;
 
+    void closeAllFloaters(const LLSD &event) const;
+
     F64 mLastUntrustedThrottle {0};
     F64 mLastMinThrottle {0};
 };
diff --git a/indra/newview/scripts/lua/require/UI.lua b/indra/newview/scripts/lua/require/UI.lua
index 30b7189c3c..df77eb2b56 100644
--- a/indra/newview/scripts/lua/require/UI.lua
+++ b/indra/newview/scripts/lua/require/UI.lua
@@ -199,4 +199,27 @@ function UI.getToolbarBtnNames()
     return leap.request('UI', {op = 'getToolbarBtnNames'}).cmd_names
 end
 
+-- ***************************************************************************
+--  Floaters
+-- ***************************************************************************
+function UI.showFloater(floater_name)
+    leap.send("LLFloaterReg", {op = "showInstance", name = floater_name})
+end
+
+function UI.hideFloater(floater_name)
+    leap.send("LLFloaterReg", {op = "hideInstance", name = floater_name})
+end
+
+function UI.toggleFloater(floater_name)
+    leap.send("LLFloaterReg", {op = "toggleInstance", name = floater_name})
+end
+
+function UI.isFloaterVisible(floater_name)
+    return leap.request("LLFloaterReg", {op = "instanceVisible", name = floater_name}).visible
+end
+
+function UI.closeAllFloaters()
+    return leap.send("UI", {op = "closeAllFloaters"})
+end
+
 return UI
diff --git a/indra/newview/scripts/lua/test_luafloater_demo.lua b/indra/newview/scripts/lua/test_luafloater_demo.lua
new file mode 100644
index 0000000000..3903d01e65
--- /dev/null
+++ b/indra/newview/scripts/lua/test_luafloater_demo.lua
@@ -0,0 +1,39 @@
+local Floater = require 'Floater'
+local leap = require 'leap'
+local startup = require 'startup'
+
+local flt = Floater(
+    'luafloater_demo.xml',
+    {show_time_lbl = {"right_mouse_down", "double_click"}})
+
+-- override base-class handleEvents() to report the event data in the floater's display field
+function flt:handleEvents(event_data)
+    self:post({action="add_text", ctrl_name="events_editor", value = event_data})
+    -- forward the call to base-class handleEvents()
+    return Floater.handleEvents(self, event_data)
+end
+
+function flt:commit_disable_ctrl(event_data)
+    self:post({action="set_enabled", ctrl_name="open_btn", value = (1 - event_data.value)})
+end
+
+function flt:commit_title_cmb(event_data)
+    self:post({action="set_title", value=event_data.value})
+end
+
+function flt:commit_open_btn(event_data)
+    floater_name = self:request({action="get_value", ctrl_name='openfloater_cmd'}).value
+    leap.send("LLFloaterReg", {name = floater_name, op = "showInstance"})
+end
+
+local function getCurrentTime()
+    local currentTime = os.date("*t")
+    return string.format("%02d:%02d:%02d", currentTime.hour, currentTime.min, currentTime.sec)
+end
+
+function flt:double_click_show_time_lbl(event_data)
+    self:post({action="set_value", ctrl_name="time_lbl", value=getCurrentTime()})
+end
+
+startup.wait('STATE_LOGIN_WAIT')
+flt:show()
diff --git a/indra/newview/scripts/lua/test_luafloater_demo2.lua b/indra/newview/scripts/lua/test_luafloater_demo2.lua
deleted file mode 100644
index 3903d01e65..0000000000
--- a/indra/newview/scripts/lua/test_luafloater_demo2.lua
+++ /dev/null
@@ -1,39 +0,0 @@
-local Floater = require 'Floater'
-local leap = require 'leap'
-local startup = require 'startup'
-
-local flt = Floater(
-    'luafloater_demo.xml',
-    {show_time_lbl = {"right_mouse_down", "double_click"}})
-
--- override base-class handleEvents() to report the event data in the floater's display field
-function flt:handleEvents(event_data)
-    self:post({action="add_text", ctrl_name="events_editor", value = event_data})
-    -- forward the call to base-class handleEvents()
-    return Floater.handleEvents(self, event_data)
-end
-
-function flt:commit_disable_ctrl(event_data)
-    self:post({action="set_enabled", ctrl_name="open_btn", value = (1 - event_data.value)})
-end
-
-function flt:commit_title_cmb(event_data)
-    self:post({action="set_title", value=event_data.value})
-end
-
-function flt:commit_open_btn(event_data)
-    floater_name = self:request({action="get_value", ctrl_name='openfloater_cmd'}).value
-    leap.send("LLFloaterReg", {name = floater_name, op = "showInstance"})
-end
-
-local function getCurrentTime()
-    local currentTime = os.date("*t")
-    return string.format("%02d:%02d:%02d", currentTime.hour, currentTime.min, currentTime.sec)
-end
-
-function flt:double_click_show_time_lbl(event_data)
-    self:post({action="set_value", ctrl_name="time_lbl", value=getCurrentTime()})
-end
-
-startup.wait('STATE_LOGIN_WAIT')
-flt:show()
diff --git a/indra/newview/scripts/lua/test_luafloater_gesture_list.lua b/indra/newview/scripts/lua/test_luafloater_gesture_list.lua
new file mode 100644
index 0000000000..bd397ef2a6
--- /dev/null
+++ b/indra/newview/scripts/lua/test_luafloater_gesture_list.lua
@@ -0,0 +1,27 @@
+local Floater = require 'Floater'
+local LLGesture = require 'LLGesture'
+local startup = require 'startup'
+
+local flt = Floater(
+    "luafloater_gesture_list.xml",
+    {gesture_list = {"double_click"}})
+
+function flt:post_build(event_data)
+    local gestures_uuid = LLGesture.getActiveGestures()
+    local action_data = {}
+    action_data.action = "add_list_element"
+    action_data.ctrl_name = "gesture_list"
+    local gestures = {}
+    for uuid, info in pairs(gestures_uuid) do
+      table.insert(gestures, {value = uuid, columns={column = "gesture_name", value = info.name}})
+    end
+    action_data.value = gestures
+    self:post(action_data)
+end
+
+function flt:double_click_gesture_list(event_data)
+    LLGesture.startGesture(event_data.value)
+end
+
+startup.wait('STATE_STARTED')
+flt:show()
diff --git a/indra/newview/scripts/lua/test_luafloater_gesture_list2.lua b/indra/newview/scripts/lua/test_luafloater_gesture_list2.lua
deleted file mode 100644
index bd397ef2a6..0000000000
--- a/indra/newview/scripts/lua/test_luafloater_gesture_list2.lua
+++ /dev/null
@@ -1,27 +0,0 @@
-local Floater = require 'Floater'
-local LLGesture = require 'LLGesture'
-local startup = require 'startup'
-
-local flt = Floater(
-    "luafloater_gesture_list.xml",
-    {gesture_list = {"double_click"}})
-
-function flt:post_build(event_data)
-    local gestures_uuid = LLGesture.getActiveGestures()
-    local action_data = {}
-    action_data.action = "add_list_element"
-    action_data.ctrl_name = "gesture_list"
-    local gestures = {}
-    for uuid, info in pairs(gestures_uuid) do
-      table.insert(gestures, {value = uuid, columns={column = "gesture_name", value = info.name}})
-    end
-    action_data.value = gestures
-    self:post(action_data)
-end
-
-function flt:double_click_gesture_list(event_data)
-    LLGesture.startGesture(event_data.value)
-end
-
-startup.wait('STATE_STARTED')
-flt:show()
-- 
cgit v1.2.3


From cf29b701b19644062a1428a64023c3cf9829e2de Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 5 Aug 2024 20:37:03 +0300
Subject: Allow getting the list of floater names, hide top menu items; add
 demo script

---
 indra/newview/lluilistener.cpp                    | 16 ++++++++++++++
 indra/newview/lluilistener.h                      |  1 +
 indra/newview/scripts/lua/require/UI.lua          |  8 +++++++
 indra/newview/scripts/lua/test_LLChatListener.lua | 19 ++++++++++++----
 indra/newview/scripts/lua/test_toolbars.lua       | 27 +++++++++++++++++++++++
 5 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 indra/newview/scripts/lua/test_toolbars.lua

(limited to 'indra/newview')

diff --git a/indra/newview/lluilistener.cpp b/indra/newview/lluilistener.cpp
index 07a8b45f89..bcc13c5fe9 100644
--- a/indra/newview/lluilistener.cpp
+++ b/indra/newview/lluilistener.cpp
@@ -100,6 +100,11 @@ LLUIListener::LLUIListener():
         &LLUIListener::addMenuSeparator,
         llsd::map("parent_menu", LLSD(), "reply", LLSD()));
 
+    add("setMenuVisible",
+        "Set menu [\"name\"] visibility to [\"visible\"]",
+        &LLUIListener::setMenuVisible,
+        llsd::map("name", LLSD(), "visible", LLSD(), "reply", LLSD()));
+
     add("defaultToolbars",
         "todo: defaultToolbars desc",
         &LLUIListener::restoreDefaultToolbars);
@@ -313,6 +318,17 @@ void LLUIListener::addMenuSeparator(const LLSD&event) const
     }
 }
 
+void LLUIListener::setMenuVisible(const LLSD &event) const
+{
+    Response response(LLSD(), event);
+    std::string menu_name(event["name"]);
+    if (!gMenuBarView->getItem(menu_name))
+    {
+        return response.error(stringize("Menu ", std::quoted(menu_name), " was not found"));
+    }
+    gMenuBarView->setItemVisible(menu_name, event["visible"].asBoolean());
+}
+
 void LLUIListener::restoreDefaultToolbars(const LLSD &event) const
 {
     LLToolBarView::loadDefaultToolbars();
diff --git a/indra/newview/lluilistener.h b/indra/newview/lluilistener.h
index bae6724b3d..98e4754306 100644
--- a/indra/newview/lluilistener.h
+++ b/indra/newview/lluilistener.h
@@ -49,6 +49,7 @@ private:
     void addMenuBranch(const LLSD&event) const;
     void addMenuItem(const LLSD&event) const;
     void addMenuSeparator(const LLSD&event) const;
+    void setMenuVisible(const LLSD &event) const;
 
     void restoreDefaultToolbars(const LLSD &event) const;
     void clearAllToolbars(const LLSD &event) const;
diff --git a/indra/newview/scripts/lua/require/UI.lua b/indra/newview/scripts/lua/require/UI.lua
index df77eb2b56..df76b1501c 100644
--- a/indra/newview/scripts/lua/require/UI.lua
+++ b/indra/newview/scripts/lua/require/UI.lua
@@ -150,6 +150,10 @@ function UI.addMenu(...)
     return leap.request('UI', args)
 end
 
+function UI.setMenuVisible(name, visible)
+    return leap.request('UI', {op='setMenuVisible', name=name, visible=visible})
+end
+
 function UI.addMenuBranch(...)
     local args = mapargs('name,label,parent_menu', ...)
     args.op = 'addMenuBranch'
@@ -222,4 +226,8 @@ function UI.closeAllFloaters()
     return leap.send("UI", {op = "closeAllFloaters"})
 end
 
+function UI.getFloaterNames()
+    return leap.request("LLFloaterReg", {op = "getFloaterNames"}).floaters
+end
+
 return UI
diff --git a/indra/newview/scripts/lua/test_LLChatListener.lua b/indra/newview/scripts/lua/test_LLChatListener.lua
index 18363ed43b..4a4d40bee5 100644
--- a/indra/newview/scripts/lua/test_LLChatListener.lua
+++ b/indra/newview/scripts/lua/test_LLChatListener.lua
@@ -1,11 +1,22 @@
 local LLChatListener = require 'LLChatListener'
 local LLChat = require 'LLChat'
-local leap = require 'leap'
+local UI = require 'UI'
 
+-- Chat listener script allows to use the following commands in Nearby chat:
+-- open inventory   -- open defined floater by name
+-- close inventory  -- close defined floater by name
+-- closeall         -- close all floaters
+-- stop             -- close the script
+-- any other messages will be echoed.
 function openOrEcho(message)
-    local floater_name = string.match(message, "^open%s+(%w+)")
-    if floater_name then
-      leap.send("LLFloaterReg", {name = floater_name, op = "showInstance"})
+    local open_floater_name = string.match(message, "^open%s+(%w+)")
+    local close_floater_name = string.match(message, "^close%s+(%w+)")
+    if open_floater_name then
+      UI.showFloater(open_floater_name)
+    elseif close_floater_name then
+      UI.hideFloater(close_floater_name)
+    elseif message == 'closeall' then
+      UI.closeAllFloaters()
     else
       LLChat.sendNearby('Echo: ' .. message)
     end
diff --git a/indra/newview/scripts/lua/test_toolbars.lua b/indra/newview/scripts/lua/test_toolbars.lua
new file mode 100644
index 0000000000..70035db775
--- /dev/null
+++ b/indra/newview/scripts/lua/test_toolbars.lua
@@ -0,0 +1,27 @@
+popup = require 'popup'
+UI = require 'UI'
+
+local OK = 'OK_okcancelbuttons'
+local BUTTONS = UI.getToolbarBtnNames()
+
+-- Clear the toolbars and then add the toolbar buttons to the random toolbar
+response = popup:alertYesCancel('Toolbars will be randomly reshuffled. Proceed?')
+if next(response) == OK then
+    UI.clearToolbars()
+    math.randomseed(os.time())
+
+    -- add the buttons to the random toolbar
+    for i = 1, #BUTTONS do
+      UI.addToolbarBtn(BUTTONS[i], math.random(3))
+    end
+
+    -- remove some of the added buttons from the toolbars
+    for i = 1, #BUTTONS do
+      if math.random(100) < 30 then
+        UI.removeToolbarBtn(BUTTONS[i])
+      end
+    end
+    popup:tip('Toolbars were reshuffled')
+else
+    popup:tip('Canceled')
+end
-- 
cgit v1.2.3


From eb82c78b071d71a0fd2d7be1c573997e41bab51e Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 6 Aug 2024 20:38:06 +0300
Subject: code clean up

---
 indra/newview/lluilistener.cpp              | 26 +++++++++++++++++++-------
 indra/newview/scripts/lua/require/UI.lua    |  8 ++++----
 indra/newview/scripts/lua/test_toolbars.lua |  5 +++--
 3 files changed, 26 insertions(+), 13 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/lluilistener.cpp b/indra/newview/lluilistener.cpp
index bcc13c5fe9..3e67531388 100644
--- a/indra/newview/lluilistener.cpp
+++ b/indra/newview/lluilistener.cpp
@@ -106,23 +106,24 @@ LLUIListener::LLUIListener():
         llsd::map("name", LLSD(), "visible", LLSD(), "reply", LLSD()));
 
     add("defaultToolbars",
-        "todo: defaultToolbars desc",
+        "Restore default toolbar buttons",
         &LLUIListener::restoreDefaultToolbars);
 
-    add("clearToolbars",
+    add("clearAllToolbars",
         "Clear all buttons off the toolbars",
         &LLUIListener::clearAllToolbars);
 
     add("addToolbarBtn",
-        "Add [\"btn_name\"] toolbar button to the [\"toolbar\"]\n"
-        "[1 (left toolbar), 2 (right toolbar), 3 (bottom toolbar)]\n"
+        "Add [\"btn_name\"] toolbar button to the [\"toolbar\"]:\n"
+        "\"left\", \"right\", \"bottom\" (default is \"bottom\")\n"
         "Position of the command in the original list can be specified as [\"rank\"]",
         &LLUIListener::addToolbarBtn,
         llsd::map("btn_name", LLSD(), "reply", LLSD()));
 
     add("removeToolbarBtn",
         "Remove [\"btn_name\"] toolbar button off the toolbar,\n"
-        "return [\"rank\"] (old position) of the command in the original list",
+        "return [\"rank\"] (old position) of the command in the original list,\n"
+        "rank -1 means that [\"btn_name\"] was not found",
         &LLUIListener::removeToolbarBtn,
         llsd::map("btn_name", LLSD(), "reply", LLSD()));
 
@@ -347,9 +348,20 @@ void LLUIListener::addToolbarBtn(const LLSD &event) const
     ToolBarLocation toolbar = ToolBarLocation::TOOLBAR_BOTTOM;
     if (event.has("toolbar"))
     {
-        toolbar = llclamp((ToolBarLocation)event["toolbar"].asInteger(), ToolBarLocation::TOOLBAR_NONE, ToolBarLocation::TOOLBAR_BOTTOM);
+        if (event["toolbar"] == "left")
+        {
+            toolbar = ToolBarLocation::TOOLBAR_LEFT;
+        }
+        else if (event["toolbar"] == "right")
+        {
+            toolbar = ToolBarLocation::TOOLBAR_RIGHT;
+        }
+        else if (event["toolbar"] != "bottom")
+        {
+            return response.error(stringize("Toolbar name ", std::quoted(event["toolbar"].asString()), " is not correct. Toolbar names are: left, right, bottom"));
+        }
     }
-    S32 rank = event.has("rank") ? event["rank"].asInteger() : - 1;
+    S32 rank = event.has("rank") ? event["rank"].asInteger() : LLToolBar::RANK_NONE;
     if(!gToolBarView->addCommand(event["btn_name"].asString(), toolbar, rank))
     {
         response.error(stringize("Toolbar button ", std::quoted(event["btn_name"].asString()), " was not found"));
diff --git a/indra/newview/scripts/lua/require/UI.lua b/indra/newview/scripts/lua/require/UI.lua
index df76b1501c..9bc9a3685d 100644
--- a/indra/newview/scripts/lua/require/UI.lua
+++ b/indra/newview/scripts/lua/require/UI.lua
@@ -177,8 +177,8 @@ end
 --  Toolbar buttons
 -- ***************************************************************************
 -- Clears all buttons off the toolbars
-function UI.clearToolbars()
-    leap.send('UI', {op='clearToolbars'})
+function UI.clearAllToolbars()
+    leap.send('UI', {op='clearAllToolbars'})
 end
 
 function UI.defaultToolbars()
@@ -186,8 +186,8 @@ function UI.defaultToolbars()
 end
 
 -- UI.addToolbarBtn{btn_name=btn_name
---          [, toolbar= 3] -- 1 [TOOLBAR_LEFT], 2 [TOOLBAR_RIGHT], 3 [TOOLBAR_BOTTOM]
---          [, rank=1]} -- position on the toolbar
+--          [, toolbar= bottom] -- left, right, bottom -- default is bottom
+--          [, rank=1]} -- position on the toolbar, starts at 0 (0 - first position, 1 - second position etc.)
 function UI.addToolbarBtn(...)
     local args = mapargs('btn_name,toolbar,rank', ...)
     args.op = 'addToolbarBtn'
diff --git a/indra/newview/scripts/lua/test_toolbars.lua b/indra/newview/scripts/lua/test_toolbars.lua
index 70035db775..9a832c5644 100644
--- a/indra/newview/scripts/lua/test_toolbars.lua
+++ b/indra/newview/scripts/lua/test_toolbars.lua
@@ -3,16 +3,17 @@ UI = require 'UI'
 
 local OK = 'OK_okcancelbuttons'
 local BUTTONS = UI.getToolbarBtnNames()
+local TOOLBARS = {'left','right','bottom'}
 
 -- Clear the toolbars and then add the toolbar buttons to the random toolbar
 response = popup:alertYesCancel('Toolbars will be randomly reshuffled. Proceed?')
 if next(response) == OK then
-    UI.clearToolbars()
+    UI.clearAllToolbars()
     math.randomseed(os.time())
 
     -- add the buttons to the random toolbar
     for i = 1, #BUTTONS do
-      UI.addToolbarBtn(BUTTONS[i], math.random(3))
+      UI.addToolbarBtn(BUTTONS[i], TOOLBARS[math.random(3)])
     end
 
     -- remove some of the added buttons from the toolbars
-- 
cgit v1.2.3