diff options
| author | callum_linden <none@none> | 2014-10-18 12:02:16 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-18 12:02:16 -0700 |
| commit | 24f035a7b76b22d83493d1e628251b424abc969a (patch) | |
| tree | 6843a068a236450d239c16e73f0fa89fdf9d420c /indra/newview/llfloaterimsession.cpp | |
| parent | bdce32a02b34e42ab2f145af5f8beb54f4e2b534 (diff) | |
Update to build on Xcode 6.0: clang fix for bracketed logical operations
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
| -rwxr-xr-x | indra/newview/llfloaterimsession.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp index 9def253ba5..fc7fcf3ab9 100755 --- a/indra/newview/llfloaterimsession.cpp +++ b/indra/newview/llfloaterimsession.cpp @@ -396,7 +396,7 @@ bool LLFloaterIMSession::canAddSelectedToChat(const uuid_vec_t& uuids) { if (!mSession || mDialog == IM_SESSION_GROUP_START - || mDialog == IM_SESSION_INVITE && gAgent.isInGroup(mSessionID)) + || (mDialog == IM_SESSION_INVITE && gAgent.isInGroup(mSessionID))) { return false; } @@ -779,7 +779,7 @@ bool LLFloaterIMSession::toggle(const LLUUID& session_id) floater->setVisible(false); return false; } - else if(floater && (!floater->isDocked() || floater->getVisible() && !floater->hasFocus())) + else if(floater && ((!floater->isDocked() || floater->getVisible()) && !floater->hasFocus())) { floater->setVisible(TRUE); floater->setFocus(TRUE); |