diff options
| author | James Cook <james@lindenlab.com> | 2009-11-25 12:31:24 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-25 12:31:24 -0800 |
| commit | 957055396d2ffa3a76b09c60cb9c3e1f73870cbf (patch) | |
| tree | 632ecbdc0c21b0e14eb72f74faa8c04765f54489 /indra/newview/llpanellogin.cpp | |
| parent | ef46d4077ca4aad322aabfe545885be136577c8a (diff) | |
| parent | 59eb8a43a467ecaa5a8c2b58bf1abfb8350c0202 (diff) | |
merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp
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 ce5d682ddc..bde34302ed 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -392,6 +392,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 @@ -683,8 +687,6 @@ void LLPanelLogin::closePanel() if (sInstance) { gViewerWindow->getRootView()->removeChild( LLPanelLogin::sInstance ); - - gFocusMgr.setDefaultKeyboardFocus(NULL); delete sInstance; sInstance = NULL; |