summaryrefslogtreecommitdiff
path: root/indra/llui/llchatmentionhelper.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@lindenlab.com>2025-05-16 19:05:57 -0400
committerGitHub <noreply@github.com>2025-05-16 19:05:57 -0400
commitbb76eae4b814e612ff2b0c62fffc6c3263058d64 (patch)
tree32818e0c938b465bf39c976955864a14b3bb512e /indra/llui/llchatmentionhelper.cpp
parent2efe514f14a0f0b405599301a14413edfce873ee (diff)
parentd5313e7161bb99045adc4a1a34d7f85de609d97b (diff)
Merge branch 'release/2025.04' into geenz/gltf-mesh-import
Diffstat (limited to 'indra/llui/llchatmentionhelper.cpp')
-rw-r--r--indra/llui/llchatmentionhelper.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llui/llchatmentionhelper.cpp b/indra/llui/llchatmentionhelper.cpp
index f7769b2cbe..5745389a58 100644
--- a/indra/llui/llchatmentionhelper.cpp
+++ b/indra/llui/llchatmentionhelper.cpp
@@ -98,7 +98,14 @@ void LLChatMentionHelper::showHelper(LLUICtrl* host_ctrl, S32 local_x, S32 local
LLRect rect = av_picker_floater->getRect();
rect.setLeftTopAndSize(floater_x, floater_y + rect.getHeight(), rect.getWidth(), rect.getHeight());
av_picker_floater->setRect(rect);
- av_picker_floater->openFloater(LLSD().with("av_name", av_name));
+ if (av_picker_floater->isShown())
+ {
+ av_picker_floater->onOpen(LLSD().with("av_name", av_name));
+ }
+ else
+ {
+ av_picker_floater->openFloater(LLSD().with("av_name", av_name));
+ }
}
void LLChatMentionHelper::hideHelper(const LLUICtrl* ctrl)