diff options
| author | Richard Nelson <none@none> | 2010-03-09 10:25:38 -0800 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-03-09 10:25:38 -0800 |
| commit | b21e89395ae168c86b7315e7bfc0eff0e17122f9 (patch) | |
| tree | af0907584706b575c48c013b6069b51b0a60cba2 | |
| parent | 6f5877e3e549fd42d0a973ccb19ade6a1ee2c392 (diff) | |
| parent | 6b177278802b3b6402e9b7d012e571e6b5171cd1 (diff) | |
merge
| -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()) { |