diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
| commit | a41ca2c34d291b4eebdeeb4475b512f2a8af5cb1 (patch) | |
| tree | e305b00950eb562abec94ce33307b6694ca6ec98 /indra/llui/llscrollcontainer.cpp | |
| parent | fd91f09e19f937cb7e2f779c4e146064415ad427 (diff) | |
| parent | 5f38ec7f92fcea833352cd30797a9d73ef5a041f (diff) | |
merge fixes for storm-1602 up to latest viewer-development
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
| -rw-r--r-- | indra/llui/llscrollcontainer.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index 380c477eb2..fe3f688fc5 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -74,11 +74,7 @@ LLScrollContainer::Params::Params() min_auto_scroll_rate("min_auto_scroll_rate", 100), max_auto_scroll_rate("max_auto_scroll_rate", 1000), reserve_scroll_corner("reserve_scroll_corner", false) -{ - name = "scroll_container"; - mouse_opaque(true); - tab_stop(false); -} +{} // Default constructor @@ -227,6 +223,15 @@ BOOL LLScrollContainer::handleKeyHere(KEY key, MASK mask) return FALSE; } +BOOL LLScrollContainer::handleUnicodeCharHere(llwchar uni_char) +{ + if (mScrolledView && mScrolledView->handleUnicodeCharHere(uni_char)) + { + return TRUE; + } + return FALSE; +} + BOOL LLScrollContainer::handleScrollWheel( S32 x, S32 y, S32 clicks ) { // Give event to my child views - they may have scroll bars |