Merge down from Branch_1-18-1:

svn merge --ignore-ancestry  svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131

1 files changed, 7 insertions, 2 deletions

diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index da53e3d104..5c8eb8b4af 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -132,8 +132,7 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, FocusLostCallback on_focu
 	
 	if (lock)
 	{
-		mLockedView = mKeyboardFocus; 
-		mKeyboardLockedFocusLostCallback = on_focus_lost; 
+		lockFocus();
 	}
 }
 
@@ -292,6 +291,12 @@ void LLFocusMgr::removeTopCtrlWithoutCallback( LLUICtrl* top_view )
 	}
 }
 
+void LLFocusMgr::lockFocus()
+{
+	mLockedView = mKeyboardFocus; 
+	mKeyboardLockedFocusLostCallback = mKeyboardFocusLostCallback; 
+}
+
 void LLFocusMgr::unlockFocus()
 {
 	mLockedView = NULL;