summaryrefslogtreecommitdiff
path: root/indra/newview/llmoveview.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-25 10:49:49 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-25 10:49:49 +0000
commit664b848bac30a7f3f1177a683e0913c9457dc041 (patch)
treeb284602f6911e31d5ef687e1c06b343ef83627e1 /indra/newview/llmoveview.cpp
parent6f4099e413d41ba56a5a339122050122363ca952 (diff)
parent41eb231e6a41da13549e5cbd4cfe6f5efeab74b1 (diff)
merge from trunk.
Diffstat (limited to 'indra/newview/llmoveview.cpp')
-rw-r--r--indra/newview/llmoveview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 93db337053..9e46a4422a 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -586,7 +586,8 @@ void LLPanelStandStopFlying::setVisible(BOOL visible)
updatePosition();
}
- LLPanel::setVisible(visible);
+ //change visibility of parent layout_panel to animate in/out
+ if (getParent()) getParent()->setVisible(visible);
}
BOOL LLPanelStandStopFlying::handleToolTip(S32 x, S32 y, MASK mask)