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/newview/llmoveview.cpp | |
| parent | 76a7df57ea572fbc877d0e335483993e33fb214f (diff) | |
| parent | f97e196d0698716fe215dfa1719519055de2cacc (diff) | |
merge
Diffstat (limited to 'indra/newview/llmoveview.cpp')
| -rw-r--r-- | indra/newview/llmoveview.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 6ae4a5e5e4..fc41137686 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -83,6 +83,16 @@ LLFloaterMove::LLFloaterMove(const LLSD& key) { } +LLFloaterMove::~LLFloaterMove() +{ + // Ensure LLPanelStandStopFlying panel is not among floater's children. See EXT-8458. + setVisible(FALSE); + + // Otherwise it can be destroyed and static pointer in LLPanelStandStopFlying::getInstance() will become invalid. + // Such situation was possible when LLFloaterReg returns "dead" instance of floater. + // Should not happen after LLFloater::destroy was modified to remove "dead" instances from LLFloaterReg. +} + // virtual BOOL LLFloaterMove::postBuild() { |