diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-19 01:45:44 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-19 01:45:44 +0000 |
| commit | 8103710c054ec6ea4a46f9732e569e543691184b (patch) | |
| tree | ac03dd6d385e3345c57eff0e1064a011597fe5d6 /indra/newview/llsidetray.cpp | |
| parent | 4ee757b45d527699b094bf9422244171fdd7d693 (diff) | |
Merging revisions 2046-2068 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231
* Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476
* IM changes
Diffstat (limited to 'indra/newview/llsidetray.cpp')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 4db849c159..ff95f8adce 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -559,6 +559,15 @@ void LLSideTray::highlightFocused() } +BOOL LLSideTray::handleScrollWheel(S32 x, S32 y, S32 mask) +{ + BOOL ret = LLPanel::handleScrollWheel(x,y,mask); + + if(!ret && childFromPoint(x,y) != 0 ) + return TRUE;//mouse wheel over sidetray buttons, eat mouse wheel + return ret; +} + //virtual BOOL LLSideTray::handleMouseDown (S32 x, S32 y, MASK mask) { @@ -641,7 +650,9 @@ LLPanel* LLSideTray::showPanel (const std::string& panel_name, const LLSD& para LLView* view = (*child_it)->findChildView(panel_name,true); if(view) { - onTabButtonClick((*child_it)->getName()); + selectTabByName ((*child_it)->getName()); + if(mCollapsed) + expandSideBar(); LLSideTrayPanelContainer* container = dynamic_cast<LLSideTrayPanelContainer*>(view->getParent()); if(container) |