diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-26 10:34:39 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-26 10:34:39 +0100 |
| commit | 44d0fd81ee3d26a80068713182ac19885ea40f95 (patch) | |
| tree | 96577339efce5ccb30dc3968ebb3ee2bd9ea4155 /indra/newview/llmoveview.cpp | |
| parent | d6726e6e4b40efaee35b8df5ac9d1098f208bcac (diff) | |
| parent | fe91462d6277251dbcc6053bc8ecd54dd93a13f0 (diff) | |
(hairy) merge from viewer-release
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() { |