From a606e7be9bb5cae91d969826a00df1985ee32f15 Mon Sep 17 00:00:00 2001 From: Martin Reddy Date: Mon, 19 Oct 2009 18:16:09 +0000 Subject: 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. --- indra/llui/llfloater.cpp | 14 ++++---------- 1 file 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); } } -- cgit v1.2.3