diff options
| author | Callum Prentice <callum@lindenlab.com> | 2016-06-02 14:00:36 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2016-06-02 14:00:36 -0700 |
| commit | a24e24fb50e2bbf0a73ccd53ff2ba64124dabeba (patch) | |
| tree | 526dc07621a65fd46c635ed875145a30c9e21432 /indra/llui | |
| parent | 4796f717c2a2c5756b91fa5281019ff23a10a613 (diff) | |
| parent | 336121312b9ea30fcc46a033f3b6c4b23358ab1b (diff) | |
Merged in NickyD/viewer-release-vlc (pull request #2)
Linux media_plugin_libvlc
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 8f7cac1f61..bbc55b785c 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -807,7 +807,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) { |