diff options
| author | Martin Reddy <lynx@lindenlab.com> | 2009-10-19 18:16:09 +0000 |
|---|---|---|
| committer | Martin Reddy <lynx@lindenlab.com> | 2009-10-19 18:16:09 +0000 |
| commit | a606e7be9bb5cae91d969826a00df1985ee32f15 (patch) | |
| tree | f10462d238784cdc43a8f7ca825bea1126ad2bc7 | |
| parent | 237a9f926f287b964358b17e06b16074a0c9a8f4 (diff) | |
DEV-41253: Code cleanup for current help context code.
Make the floater help buttons, "?", use exactly the same code path as
the side tray panels to evaluate the current help context, so that we
don't have two implementations that could diverge in the future.
| -rw-r--r-- | indra/llui/llfloater.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 44c5f8c0de..0c0c5921ce 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1449,18 +1449,12 @@ void LLFloater::onClickHelp( LLFloater* self ) { if (self && LLUI::sHelpImpl) { - // get the help topic for this floater - std::string help_topic = self->getHelpTopic(); - - // but use a more specific help topic for the currently - // displayed tab inside of this floater, if present - LLPanel *curtab = self->childGetVisibleTabWithHelp(); - if (curtab) + // find the current help context for this floater + std::string help_topic; + if (self->findHelpTopic(help_topic)) { - help_topic = curtab->getHelpTopic(); + LLUI::sHelpImpl->showTopic(help_topic); } - - LLUI::sHelpImpl->showTopic(help_topic); } } |