livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Martin Reddy 2009-10-19 18:16:09 +00:00
parent 237a9f926f
commit a606e7be9b
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llui/llfloater.cpp
View File

@ -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);
}
}