Merge branch 'geenz/linux-to-develop' into marchcat/lua-linux-develop

# Conflicts:
#	.github/workflows/build.yaml
#	indra/llinventory/llinventory.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llvoiceclient.cpp
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml

1 files changed, 19 insertions, 0 deletions

diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 95e34b4df1..a58d7546ce 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -249,6 +249,25 @@ public:
 
     /*virtual*/ bool            canEdit() const { return false; }
 
+    /*virtual*/ bool            handleRightMouseDown(S32 x, S32 y, MASK mask)
+    {
+        bool show_menu = !mEditor.hasSelection()
+            || (mEditor.mSelectionStart == mStart && mEditor.mSelectionEnd == mStart + 1);
+        if (show_menu && mEditor.getShowContextMenu())
+        {
+            // User clicked an item, user expects the menu to be
+            // in 'context' for the item. Change selection to match.
+            // Todo: Might be better to 'smartly' deselect here
+            // and to have an object specific menu.
+            mEditor.setCursorPos(mStart + 1);
+            mEditor.mSelectionStart = mStart;
+            mEditor.mSelectionEnd = mStart + 1;
+
+            mEditor.showContextMenu(x, y);
+            return true;
+        }
+        return false;
+    }
 
     /*virtual*/ bool            handleHover(S32 x, S32 y, MASK mask)
     {