diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-10 22:39:11 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-10 22:39:11 -0800 |
| commit | 0e07758b540374aa421d2938ce5ed13e2b9eefe4 (patch) | |
| tree | 145600f9494489b686e13b53edc7f10d75afa0e3 /indra/llui/llpanel.cpp | |
| parent | 4bbe823302427a705ea541d968f6058571a13c2f (diff) | |
| parent | 61fbc02deb08c1a69b8c24498fe559359496ac91 (diff) | |
merge with STORM-105 and viewer-development
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; } |