diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-08-25 14:37:46 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-08-25 14:37:46 -0400 |
| commit | cc29b44dcfd59aa649bad62772fc3b228be40b9a (patch) | |
| tree | bf57e9f024e24ac3d1a52b0b44d8ae171a67c5b9 /indra/llui | |
| parent | 17382b22e0fff078703a667cfd199db7d079ddbd (diff) | |
MAINT-5011: Fix type error surfaced by gcc 4.7.
LLView::childFromPoint(), which is declared to return LLView*, contained a
code path that could 'return false'. This is blatantly wrong. Why has it
compiled on our other compilers so far?
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..93a254593c 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 0; BOOST_FOREACH(LLView* viewp, mChildList) { |