summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2010-10-11 19:58:16 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2010-10-11 19:58:16 +0300
commitc47a5dfe003e4b6ae8987ab3169f14694c97efc3 (patch)
tree63ce769c1303b96ff0e70f458a28ed8eb5bbd9a2 /indra/llui
parentae0930751b991737e3fda2b3774411ea71160dca (diff)
STORM-298 FIXED Don't scroll the My Landmarks panel down when favorites get changed.
I'm not sure what the root cause of the problem was (maybe invalid initial selection in folder view), but what seems to be definitely wrong is passing "scroll to rect" event from *invisible* folder views up to accordion control, which is what I've fixed.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llaccordionctrltab.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index b7da5f4a1b..32112c6c51 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -735,6 +735,12 @@ S32 LLAccordionCtrlTab::notifyParent(const LLSD& info)
return 1;
}
+
+ if (!getDisplayChildren())
+ {
+ // Don't pass scrolling event further if our contents are invisible (STORM-298).
+ return 1;
+ }
}
return LLUICtrl::notifyParent(info);