diff options
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r-- | indra/llui/llfloater.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index d631a7cd65..021e2e94ac 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1252,6 +1252,12 @@ BOOL LLFloater::offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButtons inde return FALSE; } +BOOL LLFloater::handleScrollWheel(S32 x, S32 y, S32 clicks) +{ + LLPanel::handleScrollWheel(x,y,clicks); + return TRUE;//always +} + // virtual BOOL LLFloater::handleMouseDown(S32 x, S32 y, MASK mask) { @@ -1433,18 +1439,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); } } |