Merge branch 'master' into DRTVWR-516-maint

# Conflicts:
#	indra/newview/llvocache.cpp

1 files changed, 10 insertions, 0 deletions

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index f8686018b8..2207e17d1c 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -648,6 +648,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);