diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-08 14:01:28 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-08 14:01:28 -0500 |
| commit | c446062bd3bd3f172b20f22f2086cea962fb7278 (patch) | |
| tree | f208fb3a103cd6a6d38d98c366bc621c9f5f58e9 /indra/llui/llpanel.cpp | |
| parent | 14c9db3a52cbafa0d057e84657f9df11d7695638 (diff) | |
| parent | 2ab3b0cc346a573fc1c292a1466628ffc63b003f (diff) | |
merge fix for STORM-284
Diffstat (limited to 'indra/llui/llpanel.cpp')
| -rw-r--r-- | indra/llui/llpanel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index c8e56630f1..900e2c789e 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -904,7 +904,7 @@ LLPanel *LLPanel::childGetVisiblePanelWithHelp() child = *it; // do we have a panel with a help topic? LLPanel *panel = dynamic_cast<LLPanel *>(child); - if (panel && panel->getVisible() && !panel->getHelpTopic().empty()) + if (panel && panel->isInVisibleChain() && !panel->getHelpTopic().empty()) { return panel; } |