diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-24 12:42:14 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-24 12:42:14 -0800 |
| commit | 9e2d78aca1fa96e96b4b324cabfb0efeb26f7397 (patch) | |
| tree | 042a161e9bc2608d0098b2ea745178384f466362 /indra/newview/llpanellogin.cpp | |
| parent | f9081220accfe5c197f1c567af8806bde236f946 (diff) | |
| parent | 04cf3fefca230f4f2c351dddebb36e691a9f7bc5 (diff) | |
Merge from product-engine
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 78f3469f0e..ec0f8e303c 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -391,6 +391,10 @@ LLPanelLogin::~LLPanelLogin() //// We know we're done with the image, so be rid of it. //gTextureList.deleteImage( mLogoImage ); + + // Controls having keyboard focus by default + // must reset it on destroy. (EXT-2748) + gFocusMgr.setDefaultKeyboardFocus(NULL); } // virtual @@ -682,8 +686,6 @@ void LLPanelLogin::closePanel() if (sInstance) { gViewerWindow->getRootView()->removeChild( LLPanelLogin::sInstance ); - - gFocusMgr.setDefaultKeyboardFocus(NULL); delete sInstance; sInstance = NULL; |