1 files changed, 7 insertions, 2 deletions

diff --git a/linden/indra/llui/llfocusmgr.cpp b/linden/indra/llui/llfocusmgr.cpp
index f79164e..f9f3350 100644
--- a/linden/indra/llui/llfocusmgr.cpp
+++ b/linden/indra/llui/llfocusmgr.cpp
@@ -152,8 +152,7 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, FocusLostCallback on_focu
         
         if (lock)
         {
-                mLockedView = mKeyboardFocus; 
-                mKeyboardLockedFocusLostCallback = on_focus_lost; 
+                lockFocus();
         }
 }
 
@@ -312,6 +311,12 @@ void LLFocusMgr::removeTopCtrlWithoutCallback( LLUICtrl* top_view )
         }
 }
 
+void LLFocusMgr::lockFocus()
+{
+        mLockedView = mKeyboardFocus; 
+        mKeyboardLockedFocusLostCallback = mKeyboardFocusLostCallback; 
+}
+
 void LLFocusMgr::unlockFocus()
 {
         mLockedView = NULL;