SL-11172 Re-fixed, now should affect 'tab' only

11 files changed, 16 insertions, 12 deletions

diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp
index 779508df49..962b8e9bb5 100644
--- a/indra/llui/llaccordionctrl.cpp
+++ b/indra/llui/llaccordionctrl.cpp
@@ -657,7 +657,7 @@ void	LLAccordionCtrl::onScrollPosChangeCallback(S32, LLScrollbar*)
 }
 
 // virtual
-void LLAccordionCtrl::onChildGotFocus(const LLUICtrl *cntrl)
+void LLAccordionCtrl::onUpdateScrollToChild(const LLUICtrl *cntrl)
 {
     if (mScrollbar && mScrollbar->getVisible())
     {
@@ -683,7 +683,7 @@ void LLAccordionCtrl::onChildGotFocus(const LLUICtrl *cntrl)
         }
     }
 
-    LLUICtrl::onChildGotFocus(cntrl);
+    LLUICtrl::onUpdateScrollToChild(cntrl);
 }
 
 void	LLAccordionCtrl::onOpen		(const LLSD& key)
diff --git a/indra/llui/llaccordionctrl.h b/indra/llui/llaccordionctrl.h
index 3e30677429..b38a76d27f 100644
--- a/indra/llui/llaccordionctrl.h
+++ b/indra/llui/llaccordionctrl.h
@@ -111,7 +111,7 @@ public:
 	void	draw();
 	
 	void	onScrollPosChangeCallback(S32, LLScrollbar*);
-	virtual void onChildGotFocus(const LLUICtrl * cntrl);
+	virtual void onUpdateScrollToChild(const LLUICtrl * cntrl);
 
 	void	onOpen		(const LLSD& key);
 	S32		notifyParent(const LLSD& info);
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index d5c4ad961c..098621b543 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -453,7 +453,7 @@ void LLAccordionCtrlTab::onVisibilityChange(BOOL new_visibility)
 }
 
 // virtual
-void LLAccordionCtrlTab::onChildGotFocus(const LLUICtrl *cntrl)
+void LLAccordionCtrlTab::onUpdateScrollToChild(const LLUICtrl *cntrl)
 {
     if (mScrollbar && mScrollbar->getVisible())
     {
@@ -478,7 +478,7 @@ void LLAccordionCtrlTab::onChildGotFocus(const LLUICtrl *cntrl)
         }
     }
 
-    LLUICtrl::onChildGotFocus(cntrl);
+    LLUICtrl::onUpdateScrollToChild(cntrl);
 }
 
 BOOL LLAccordionCtrlTab::handleMouseDown(S32 x, S32 y, MASK mask)
diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index 53546ad5a1..2c72e8c036 100644
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -159,7 +159,7 @@ public:
 	 * Raises notifyParent event with "child_visibility_change" = new_visibility
 	 */
 	void onVisibilityChange(BOOL new_visibility);
-	virtual void onChildGotFocus(const LLUICtrl * cntrl);
+	virtual void onUpdateScrollToChild(const LLUICtrl * cntrl);
 
 	// Changes expand/collapse state and triggers expand/collapse callbacks
 	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 3ad504d68d..83cbbe0207 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -2142,6 +2142,7 @@ void LLLineEditor::clear()
 void LLLineEditor::onTabInto()
 {
 	selectAll();
+    LLUICtrl::onTabInto();
 }
 
 //virtual
diff --git a/indra/llui/llmultisliderctrl.cpp b/indra/llui/llmultisliderctrl.cpp
index c460a08afc..4026a9e38e 100644
--- a/indra/llui/llmultisliderctrl.cpp
+++ b/indra/llui/llmultisliderctrl.cpp
@@ -474,6 +474,7 @@ void LLMultiSliderCtrl::onTabInto()
 	{
 		mEditor->onTabInto(); 
 	}
+    LLF32UICtrl::onTabInto();
 }
 
 void LLMultiSliderCtrl::reportInvalidData()
diff --git a/indra/llui/llsliderctrl.cpp b/indra/llui/llsliderctrl.cpp
index 0056cb6dc4..f5f160a3d6 100644
--- a/indra/llui/llsliderctrl.cpp
+++ b/indra/llui/llsliderctrl.cpp
@@ -438,6 +438,7 @@ void LLSliderCtrl::onTabInto()
 	{
 		mEditor->onTabInto(); 
 	}
+    LLF32UICtrl::onTabInto();
 }
 
 void LLSliderCtrl::reportInvalidData()
diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp
index ce3fc29d32..ee78b82429 100644
--- a/indra/llui/llspinctrl.cpp
+++ b/indra/llui/llspinctrl.cpp
@@ -442,7 +442,8 @@ void LLSpinCtrl::setAllowEdit(BOOL allow_edit)
 
 void LLSpinCtrl::onTabInto()
 {
-	mEditor->onTabInto(); 
+	mEditor->onTabInto();
+    LLF32UICtrl::onTabInto();
 }
 
 
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index e1d275c351..544a76e8d5 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -679,7 +679,6 @@ void LLUICtrl::setFocus(BOOL b)
 		if (!hasFocus())
 		{
 			gFocusMgr.setKeyboardFocus( this );
-			onChildGotFocus(this);
 		}
 	}
 	else
@@ -722,8 +721,9 @@ void LLUICtrl::resetDirty()
 }
 
 // virtual
-void LLUICtrl::onTabInto()				
+void LLUICtrl::onTabInto()
 {
+    onUpdateScrollToChild(this);
 }
 
 // virtual
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 9d5cc70580..d81e2cd494 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -641,12 +641,12 @@ void LLView::onVisibilityChange ( BOOL new_visibility )
 }
 
 // virtual
-void LLView::onChildGotFocus(const LLUICtrl * cntrl)
+void LLView::onUpdateScrollToChild(const LLUICtrl * cntrl)
 {
     LLView* parent_view = getParent();
     if (parent_view)
     {
-        parent_view->onChildGotFocus(cntrl);
+        parent_view->onUpdateScrollToChild(cntrl);
     }
 }
 
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 643436eb8c..5c91c37d3c 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -301,7 +301,7 @@ public:
 	virtual BOOL	setLabelArg( const std::string& key, const LLStringExplicit& text );
 
 	virtual void	onVisibilityChange ( BOOL new_visibility );
-	virtual void	onChildGotFocus(const LLUICtrl * cntrl);
+	virtual void	onUpdateScrollToChild(const LLUICtrl * cntrl);
 
 	void			pushVisible(BOOL visible)	{ mLastVisible = mVisible; setVisible(visible); }
 	void			popVisible()				{ setVisible(mLastVisible); }