summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpresetscamerapulldown.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2023-01-24 20:15:43 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2023-01-24 20:15:43 +0000
commit3375e1a7b518eb40eb1814ced745266ce3a54ce7 (patch)
treef2b1281ec664e72615d11c6bd35a944d8897fa50 /indra/newview/llpanelpresetscamerapulldown.cpp
parentce5ac93883b71b6abf8cffa35204541e257c6b02 (diff)
parent111fc04e5df60e1d509b9ec80a1340bab4383cce (diff)
Merge branch 'DRTVWR-567' of ssh://github.com/secondlife/viewer 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
{