summaryrefslogtreecommitdiff
path: root/indra/newview/llmoveview.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-24 08:47:13 -0800
committerJames Cook <james@lindenlab.com>2009-11-24 08:47:13 -0800
commitf9081220accfe5c197f1c567af8806bde236f946 (patch)
treee711a74a34aa309222d28f694f02345dde305c4d /indra/newview/llmoveview.cpp
parent76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff)
parent0b3f6b3e9a1414c11ccf6011930c2eec6cf2fdd7 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
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)