diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-10 23:26:58 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-10 23:26:58 +0300 |
| commit | 4617e07b3795e46c2037462f738ab81b35bd7294 (patch) | |
| tree | 9cd991fe86f65590f9bb5c87499fab1911e4aae5 /indra/llui | |
| parent | 5dd97bc2bd4924b0342068e697b5d45165225b76 (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
Merged in lindenlab/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 e1d9b1a487..9604e5ce10 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -832,7 +832,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) { |