diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-09 20:59:38 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-09 20:59:38 +0000 |
| commit | bc1df4b1db40f2cff98b4002f3f2d3a723c84be5 (patch) | |
| tree | 2b704bb91f4f039e241f40eb56b7d8352fffb8ba /indra/newview/lltoolpie.cpp | |
| parent | 8bed0558f538f7dfb8875e418f20c9d9da93ae17 (diff) | |
Fix a whole bunch of compilation warnings reported by gcc 4.4
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 986555db49..92c9f3f553 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -189,8 +189,8 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show) } // 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; |