diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
commit | 60c4621500e478d66a8bdc3a1c80573be2860fee (patch) | |
tree | fa10b52caf3a54e03502058cd52d77952370cb34 /indra/newview/llpopupview.cpp | |
parent | 2e525711cd08d5f1dce991d1b6595a8dd41c9e3b (diff) | |
parent | ba414d500ca8cb88da530c89ba373c95195ce633 (diff) |
Automated merge from viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llpopupview.cpp')
-rw-r--r-- | indra/newview/llpopupview.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp index 1668a91eed..d8ad59c90c 100644 --- a/indra/newview/llpopupview.cpp +++ b/indra/newview/llpopupview.cpp @@ -220,10 +220,6 @@ void LLPopupView::removePopup(LLView* popup) { if (popup) { - if (gFocusMgr.childHasKeyboardFocus(popup)) - { - gFocusMgr.setKeyboardFocus(NULL); - } popup_list_t::iterator iter = std::find(mPopups.begin(), mPopups.end(), popup->getHandle()); if(iter != mPopups.end()) { |