diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-07-30 10:11:55 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-07-30 10:11:55 -0400 |
| commit | 19c0d6d4eaf21cbfc96d7057c11db35edf73f2fe (patch) | |
| tree | 21984bc2d7a41ba2587a424499f97d3e6d527da4 /indra/llui/llfloater.cpp | |
| parent | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff) | |
| parent | 7a4174447a0762dcab2769d1401295b78c9341fd (diff) | |
Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1
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() { |