diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-10-17 14:58:29 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-10-17 14:58:29 -0700 |
| commit | 38d06dcce66ce3a7f5a7a1521f0305dbc0ea0bc5 (patch) | |
| tree | 38745f1a60a13b496014a64690e7afda14611830 /indra/llui | |
| parent | b2eded73b9bf55e2253a9c39113ff0598c2c18cb (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
Merged lindenlab/viewer-release into default
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 62c3f401bf..fd7406b653 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) { |