summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-03-09 10:25:38 -0800
committerRichard Nelson <none@none>2010-03-09 10:25:38 -0800
commitb21e89395ae168c86b7315e7bfc0eff0e17122f9 (patch)
treeaf0907584706b575c48c013b6069b51b0a60cba2 /indra/newview
parent6f5877e3e549fd42d0a973ccb19ade6a1ee2c392 (diff)
parent6b177278802b3b6402e9b7d012e571e6b5171cd1 (diff)
merge
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpopupview.cpp4
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())
{