diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-01-13 17:57:03 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-01-13 17:57:03 +0000 |
| commit | f3bd6481a554ade34b133b2ae805838e27598639 (patch) | |
| tree | 7904486e48005883828ebd75491c95cc9ef1f891 /indra/llui/lluictrl.cpp | |
| parent | db2321bad296dd82af300e6bfdd50b5d232af067 (diff) | |
EXT-4197: Search in sub-panels for help IDs too.
In order to support unique help IDs for the Landmark and Place Profile
panels off the Places sidetray, we need to also search within any
embedded (and visible) sub-panels.
Diffstat (limited to 'indra/llui/lluictrl.cpp')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index 6044908ca7..f016c0af89 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -876,6 +876,14 @@ bool LLUICtrl::findHelpTopic(std::string& help_topic_out) return true; // success (tab) } + // does the panel have a sub-panel with a help topic? + LLPanel *subpanel = panel->childGetVisiblePanelWithHelp(); + if (subpanel) + { + help_topic_out = subpanel->getHelpTopic(); + return true; // success (subpanel) + } + // otherwise, does the panel have a help topic itself? if (!panel->getHelpTopic().empty()) { |