From eb7bf3ed4f1d1e05f25b05cfefd5736f3ab4f609 Mon Sep 17 00:00:00 2001 From: Liny Date: Fri, 15 Mar 2013 13:23:45 -0700 Subject: [PATCH] Proper fix for FIRE-9465: correctly clamp scroll values so tabs cant be moved around via scrolling when they should be able to. --- indra/llui/lltabcontainer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 209df896f5..c23855cfea 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -874,11 +874,11 @@ BOOL LLTabContainer::handleScrollWheel(S32 x, S32 y, S32 clicks) { if(clicks < 0) { - setScrollPos(getScrollPos() - 1); + setScrollPos(llmax(0, getScrollPos()-1)); } else { - setScrollPos(getScrollPos() + 1); + setScrollPos(llmin(getScrollPos()+1, getMaxScrollPos())); } }