diff options
author | Oz Linden <oz@lindenlab.com> | 2010-11-08 14:00:29 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-11-08 14:00:29 -0500 |
commit | 2ab3b0cc346a573fc1c292a1466628ffc63b003f (patch) | |
tree | 4bf853d0feee3a273855ed270ebfb1506d2ec821 /indra/llui/llpanel.cpp | |
parent | f111e84cf72d7c53f917e40cd28f289594909d62 (diff) | |
parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (diff) |
merge fix for STORM-189
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; } |