diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-04 16:27:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-04 16:27:38 -0400 |
| commit | 124a59263184391b0b4ec418c532b7a715e9b5a3 (patch) | |
| tree | 0206913c75ff29f0bc5c43304ae2c44219a14745 /indra/llui/llpanel.cpp | |
| parent | 889aff8d87a4dbf3ca43c43bdeed825f67fd5e60 (diff) | |
| parent | 29283804ad75c89ca000337d03d8b32309254cef (diff) | |
merging up latest changes from 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; } |