From 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 Mon Sep 17 00:00:00 2001 From: Monroe Williams Date: Thu, 2 Aug 2007 01:18:34 +0000 Subject: 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 --- indra/llui/llfocusmgr.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/llui/llfocusmgr.cpp') 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; -- cgit v1.3