summaryrefslogtreecommitdiff
path: root/indra/newview/llpopupview.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-10 11:33:43 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-10 11:33:43 +0000
commite65f9452436bcfaebc19ddeecb29254a75e4d2b4 (patch)
treec06289477e02126368b0713956461e109781c603 /indra/newview/llpopupview.cpp
parentd0d1534e34a544a2a2acc9993421f587bb4f6ede (diff)
parentbc852b9a5dcffcec4cbf15b5cc4e571f8970c125 (diff)
merge from viewer-2-0
Diffstat (limited to 'indra/newview/llpopupview.cpp')
-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())
{