diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-11 01:21:12 +0300 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-11 01:21:12 +0300 |
commit | 0f1d13fd4a8f1bbac74cc70234e90b6c08e45e9b (patch) | |
tree | 858a8956eabe282f972f219a665d3ebbeea11e36 /indra/llui | |
parent | d66cd019b30ec6ab519fa0ea0c76c1beb99be74c (diff) | |
parent | 4617e07b3795e46c2037462f738ab81b35bd7294 (diff) |
Merged in lindenlab/viewer-bear
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) { |