summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpresetscamerapulldown.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2023-01-23 16:29:38 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2023-01-23 16:29:56 +0200
commit111fc04e5df60e1d509b9ec80a1340bab4383cce (patch)
treeaed67acff4dd7497cf39e3a5c3632cacd57126c9 /indra/newview/llpanelpresetscamerapulldown.cpp
parent819eec6f8c3abbf71ec3bdaaf4891068574fdc46 (diff)
parenta0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff)
Merge branch 'main' into DRTVWR-567
Diffstat (limited to 'indra/newview/llpanelpresetscamerapulldown.cpp')
-rw-r--r--indra/newview/llpanelpresetscamerapulldown.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llpanelpresetscamerapulldown.cpp b/indra/newview/llpanelpresetscamerapulldown.cpp
index 183123e534..4c9c30160c 100644
--- a/indra/newview/llpanelpresetscamerapulldown.cpp
+++ b/indra/newview/llpanelpresetscamerapulldown.cpp
@@ -127,7 +127,10 @@ void LLPanelPresetsCameraPulldown::onRowClick(const LLSD& user_data)
LL_DEBUGS() << "selected '" << name << "'" << LL_ENDL;
LLFloaterCamera::switchToPreset(name);
- setVisible(FALSE);
+ // Scroll grabbed focus, drop it to prevent selection of parent menu
+ setFocus(FALSE);
+
+ setVisible(FALSE);
}
else
{