diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-04-18 19:13:28 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-04-18 19:13:28 +0300 |
| commit | 4106d203e016077fe9e233da8fbaa9e2e9a24403 (patch) | |
| tree | 67334fc6bf3dab33e1a46e0c84ee44c4280e2fae /indra | |
| parent | fa36f85b007a124c418fd8cfc0e836cc7fdc86cf (diff) | |
CHUI-938 FIXED Pop up (?) notification steals focus
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llfloater.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 6816137e52..d97569839a 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -507,22 +507,11 @@ LLFloater::~LLFloater() { LLFloaterReg::removeInstance(mInstanceName, mKey); -// delete mNotificationContext; -// mNotificationContext = NULL; - - //// am I not hosted by another floater? - //if (mHostHandle.isDead()) - //{ - // LLFloaterView* parent = (LLFloaterView*) getParent(); - - // if( parent ) - // { - // parent->removeChild( this ); - // } - //} - - // Just in case we might still have focus here, release it. - releaseFocus(); + if( gFocusMgr.childHasKeyboardFocus(this)) + { + // Just in case we might still have focus here, release it. + releaseFocus(); + } // This is important so that floaters with persistent rects (i.e., those // created with rect control rather than an LLRect) are restored in their |