diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-03-22 22:36:45 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-03-24 18:32:22 +0200 |
| commit | 757655d7c342d66711937ff7786a50f1c52d8699 (patch) | |
| tree | 4a15b77548e483d8589c2302d2ea7be800e59774 /indra/llui | |
| parent | 1161262029f9619fb02d81575382b64d82d9cd09 (diff) | |
Revert "SL-20416 Fix Crash Report 1409376 (update)"
This reverts commit cc43f42e6b7401c2cdd3204a16f757f5169bd95b.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 11 | ||||
| -rw-r--r-- | indra/llui/llfloater.h | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index de3de53569..fb90cebd39 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -506,7 +506,6 @@ void LLFloater::enableResizeCtrls(bool enable, bool width, bool height) void LLFloater::destroy() { - gFloaterView->onDestroyFloater(this); // LLFloaterReg should be synchronized with "dead" floater to avoid returning dead instance before // it was deleted via LLMortician::updateClass(). See EXT-8458. LLFloaterReg::removeInstance(mInstanceName, mKey); @@ -2573,7 +2572,7 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore return; } - if (mFrontChild) + if (mFrontChild && !mFrontChild->isDead() && mFrontChild->getVisible()) { mFrontChild->goneFromFront(); } @@ -3235,14 +3234,6 @@ void LLFloaterView::setToolbarRect(LLToolBarEnums::EToolBarLocation tb, const LL } } -void LLFloaterView::onDestroyFloater(LLFloater* floater) -{ - if (mFrontChild == floater) - { - mFrontChild = nullptr; - } -} - void LLFloater::setInstanceName(const std::string& name) { if (name != mInstanceName) diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 88f9e77777..5f4e1a2cad 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -607,7 +607,6 @@ public: LLFloater* getFrontmostClosableFloater(); void setToolbarRect(LLToolBarEnums::EToolBarLocation tb, const LLRect& toolbar_rect); - void onDestroyFloater(LLFloater* floater); private: void hiddenFloaterClosed(LLFloater* floater); |