summaryrefslogtreecommitdiff
path: root/indra/llui/lluictrl.cpp
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-09-22 15:28:13 -0600
committerDave Houlton <euclid@lindenlab.com>2020-09-22 15:28:13 -0600
commit86e7cc3d35e41a88b25175bafb5687e1864423d9 (patch)
treea5ebd2bd8a4d6e87f55d1be6f278b1807b53de0f /indra/llui/lluictrl.cpp
parentb62d7c2f06fdaa91312fd6857d03748defe8b60f (diff)
parent60ed688026269568a9eef67437dc780f88c92871 (diff)
Merge branch 'master' v6.4.9 into DRTVWR-497
Diffstat (limited to 'indra/llui/lluictrl.cpp')
-rw-r--r--indra/llui/lluictrl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index c98da0d410..544a76e8d5 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -721,8 +721,9 @@ void LLUICtrl::resetDirty()
}
// virtual
-void LLUICtrl::onTabInto()
+void LLUICtrl::onTabInto()
{
+ onUpdateScrollToChild(this);
}
// virtual