diff options
| author | Palmer <palmer@lindenlab.com> | 2010-01-29 15:05:28 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-01-29 15:05:28 -0800 |
| commit | bdb8ed5a0f70f8a7bf868448ef45e32e5beb8bdb (patch) | |
| tree | f56bc9b202f49f1ab631524684b7db41ae571f80 /indra/newview/llmoveview.cpp | |
| parent | c504c40a754a79baf0e4b1d1c10ca44197d577df (diff) | |
| parent | 0bb7a85d06e7201887962000cb3e91bf456ffa09 (diff) | |
merge
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 } |