diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-21 07:24:40 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-21 07:24:40 +0100 |
| commit | 842e5111ae2d0a83755ff902afa43dc84e45662b (patch) | |
| tree | e77d8803bb967453ff6bc62bbf20f9d260f5db26 /indra/llui/llfloater.cpp | |
| parent | 76a7df57ea572fbc877d0e335483993e33fb214f (diff) | |
| parent | f97e196d0698716fe215dfa1719519055de2cacc (diff) | |
merge
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 39a6855273..22d6f6ca52 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -451,6 +451,14 @@ void LLFloater::enableResizeCtrls(bool enable) } } +void LLFloater::destroy() +{ + // 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); + die(); +} + // virtual LLFloater::~LLFloater() { |