diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 12:09:37 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 12:09:37 -0800 |
| commit | e2612effbe463cd89853d3d6a047b3aa7e275975 (patch) | |
| tree | 148fb7fb1bdbf84c148d8ccb6496a6fba7ef9afb /indra/newview/llmoveview.cpp | |
| parent | 5a34cf1af83314774f11b0d24279794794bc9147 (diff) | |
| parent | fab60b8c05a89498bd8efeafdea8acfa5f94f06c (diff) | |
merge from viewer2
Diffstat (limited to 'indra/newview/llmoveview.cpp')
| -rw-r--r-- | indra/newview/llmoveview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 5981baab60..4bf2bac649 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -651,6 +651,9 @@ void LLPanelStandStopFlying::reparent(LLFloaterMove* move_view) // Detach from movement controls. parent->removeChild(this); mOriginalParent.get()->addChild(this); + // update parent with self visibility (it is changed in setVisible()). EXT-4743 + mOriginalParent.get()->setVisible(getVisible()); + mAttached = false; updatePosition(); // don't defer until next draw() to avoid flicker } |