diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-10-11 10:59:17 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-10-11 10:59:17 -0400 |
| commit | 704c53b3c506c1274981b3e1ca5a22c16e4fbbb4 (patch) | |
| tree | 258785e6ebcd41009e6ef160a5d7b8e9ed218f94 /indra/llui | |
| parent | eb8961235f7dcb03e3fe8ae2d02929d97cc5d7d7 (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
MAINT-5232: Merge up to VLC viewer from viewer-release
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 2f27eebcd8..de2b15823f 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -812,7 +812,7 @@ LLView* LLView::childrenHandleHover(S32 x, S32 y, MASK mask) LLView* LLView::childFromPoint(S32 x, S32 y, bool recur) { if (!getVisible()) - return false; + return NULL; BOOST_FOREACH(LLView* viewp, mChildList) { |