From cc29b44dcfd59aa649bad62772fc3b228be40b9a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 25 Aug 2016 14:37:46 -0400
Subject: [PATCH] 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?
---
indra/llui/llview.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 62c3f401bf9..93a254593c2 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)
{
--
GitLab