diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-01-15 18:01:31 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-01-15 18:01:31 +0000 |
| commit | 5c09d482a47a8894ebebc9d3c8053b25a280f58e (patch) | |
| tree | a80073669c5aee2adb3e1fd04e8cf5fa508ee181 /indra/llui | |
| parent | eb560796faaac95609edb90b19b3e08299f730eb (diff) | |
EXT-4148 EXT-4230: Lots of help ID updates.
Updated the logic of the help ID detection to search sub-panels before
searching active tabs. For some reason, certain tabs are still visible
and active even though they are not being displayed on screen. I also
removed a bunch of help IDs for button panels that just confuse things.
Also went through all of the side panel tabs and added new help IDs
where appropriate. These are:
profile_classified_info
profile_edit_classified
profile_pick_info
profile_edit_pick
my_inventory_tab
recent_inventory_tab
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index f016c0af89..3ade46d367 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -868,14 +868,6 @@ bool LLUICtrl::findHelpTopic(std::string& help_topic_out) if (panel) { - // does the panel have an active tab with a help topic? - LLPanel *tab = panel->childGetVisibleTabWithHelp(); - if (tab) - { - help_topic_out = tab->getHelpTopic(); - return true; // success (tab) - } - // does the panel have a sub-panel with a help topic? LLPanel *subpanel = panel->childGetVisiblePanelWithHelp(); if (subpanel) @@ -884,6 +876,14 @@ bool LLUICtrl::findHelpTopic(std::string& help_topic_out) return true; // success (subpanel) } + // does the panel have an active tab with a help topic? + LLPanel *tab = panel->childGetVisibleTabWithHelp(); + if (tab) + { + help_topic_out = tab->getHelpTopic(); + return true; // success (tab) + } + // otherwise, does the panel have a help topic itself? if (!panel->getHelpTopic().empty()) { |