diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:29:47 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-10 10:29:47 +0300 |
commit | 5118ba7adfc6f49f5b23694507dc7ceb8365b969 (patch) | |
tree | 4e499acfe5617682c5eca52998b5c10cdac8609a /indra/llui/lltexteditor.cpp | |
parent | 16e638db975278f6018fe1e21ba1954b7f159149 (diff) | |
parent | 84dfe55810815e8c274044cea5c81aaed89a787f (diff) |
Merge pull request #1179 from secondlife/marchcat/y-merge
Release (Maint W) -> Maint YZ merge
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
-rw-r--r-- | indra/llui/lltexteditor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index a247e8700a..7150052b65 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -1862,7 +1862,8 @@ BOOL LLTextEditor::handleKeyHere(KEY key, MASK mask ) } if (mEnableTooltipPaste && - LLToolTipMgr::instance().toolTipVisible() && + LLToolTipMgr::instance().toolTipVisible() && + LLToolTipMgr::instance().isTooltipPastable() && KEY_TAB == key) { // Paste the first line of a tooltip into the editor std::string message; |