diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-03 16:40:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-03 16:40:04 -0400 |
| commit | af52ec169f32c0239d9b09eb21248aebc8071035 (patch) | |
| tree | edff4025d6b01deecf4d60c66ea8d5d4847d7423 /indra/llui/llscrollcontainer.cpp | |
| parent | a8b74a17cdf357987624eebdd8cf5e544487293a (diff) | |
| parent | 6eb09ab2ae9c90b23c8af1929e7d0a2088a6e76e (diff) | |
merge changes for storm-1630
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
| -rw-r--r-- | indra/llui/llscrollcontainer.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index b44b4c36b6..fe3f688fc5 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -223,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 |