Make keyboard focus more robust under closed floaters.

2013-02-08 18:40:14 +01:00
parent dd6f95cd33
commit 2d7ab61c6e
4 changed files with 40 additions and 7 deletions
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -911,6 +911,8 @@ void LLFloater::setMinimized(BOOL minimize)

 		// Lose keyboard focus when minimized
 		releaseFocus();
+		// Also reset mLockedView and mLastKeyboardFocus, to avoid that we get focus back somehow.
+		gFocusMgr.removeKeyboardFocusWithoutCallback(this);

 		for (S32 i = 0; i < 4; i++)
 		{