summaryrefslogtreecommitdiff
path: root/indra/llui/llview.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-09-22 22:51:33 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-09-22 22:51:33 +0300
commit730af5d4888653ce2ccb4bae6dd3919619d58a30 (patch)
treeb9b5f7f7b9bfdca690c317dc8c90a23f0a2dd1bf /indra/llui/llview.cpp
parentbdedfb3755d54a6b4468a5251c9ddeae2b092d37 (diff)
parent60ed688026269568a9eef67437dc780f88c92871 (diff)
Merged master (DRTVWR-503) into DRTVWR-482
Diffstat (limited to 'indra/llui/llview.cpp')
-rw-r--r--indra/llui/llview.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index bd213d594a..e3a6a98a9f 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -646,6 +646,16 @@ void LLView::onVisibilityChange ( BOOL new_visibility )
}
// virtual
+void LLView::onUpdateScrollToChild(const LLUICtrl * cntrl)
+{
+ LLView* parent_view = getParent();
+ if (parent_view)
+ {
+ parent_view->onUpdateScrollToChild(cntrl);
+ }
+}
+
+// virtual
void LLView::translate(S32 x, S32 y)
{
mRect.translate(x, y);