From b5724bc0e97328a1859fc52b444e0a2edec255dd Mon Sep 17 00:00:00 2001 From: Martin Reddy Date: Fri, 25 Sep 2009 16:51:25 +0000 Subject: SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This fixes all of the parentheses warnings in the code. Original patch was reviewed by merov (and others). --- indra/newview/lltoolpie.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/lltoolpie.cpp') diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index d6297c30c7..5c210c5c28 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -210,8 +210,8 @@ BOOL LLToolPie::pickLeftMouseDownCallback() } // else nothing (fall through to touch) case CLICK_ACTION_PAY: - if (object && object->flagTakesMoney() - || parent && parent->flagTakesMoney()) + if ((object && object->flagTakesMoney()) + || (parent && parent->flagTakesMoney())) { // pay event goes to object actually clicked on mClickActionObject = object; -- cgit v1.2.3