summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpresetspulldown.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2022-12-13 20:51:27 -0500
committerNat Goodspeed <nat@lindenlab.com>2022-12-13 20:51:27 -0500
commitd4822f10142887daa9ef2d5575a2c2e1bb24b389 (patch)
tree3b0b66779887ce2dcc3b2d027ce9b9d68c145d3b /indra/newview/llpanelpresetspulldown.cpp
parent424d3ef83cdb354e66789f22f65394f4db523128 (diff)
parent9e7829c9cb140f994c9aa12dddcd4518c4c43a40 (diff)
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llpanelpresetspulldown.cpp')
-rw-r--r--indra/newview/llpanelpresetspulldown.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp
index d52ad8056f..23e4fa8887 100644
--- a/indra/newview/llpanelpresetspulldown.cpp
+++ b/indra/newview/llpanelpresetspulldown.cpp
@@ -122,6 +122,9 @@ void LLPanelPresetsPulldown::onRowClick(const LLSD& user_data)
LL_DEBUGS() << "selected '" << name << "'" << LL_ENDL;
LLPresetsManager::getInstance()->loadPreset(PRESETS_GRAPHIC, name);
+ // Scroll grabbed focus, drop it to prevent selection of parent menu
+ setFocus(FALSE);
+
setVisible(FALSE);
}
else