From d75824d520ba1965e48196f8b230ded0f15c5841 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 13 Nov 2012 16:45:56 -0800
Subject: [PATCH] CHUI-486: Post code review changes for last submit, just
added in some parenthesis for conditional statements, thus making them more
clear.
---
indra/newview/llimview.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 3b217ef4829..0f4bbd054a0 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -148,8 +148,8 @@ void toast_callback(const LLSD& msg){
if(session->isP2PSessionType())
{
//Ignores non-friends
- if(LLAvatarTracker::instance().getBuddyInfo(msg["from_id"]) == NULL &&
- gSavedSettings.getString("NotificationNonFriendIMOptions") != "toast")
+ if((LLAvatarTracker::instance().getBuddyInfo(msg["from_id"]) == NULL)
+ && (gSavedSettings.getString("NotificationNonFriendIMOptions") != "toast"))
{
return;
}
@@ -160,14 +160,14 @@ void toast_callback(const LLSD& msg){
}
}
//Ignore Ad Hoc Toasts
- else if(session->isAdHocSessionType() &&
- gSavedSettings.getString("NotificationConferenceIMOptions") != "toast")
+ else if(session->isAdHocSessionType()
+ && (gSavedSettings.getString("NotificationConferenceIMOptions") != "toast"))
{
return;
}
//Ignore Group Toasts
- else if(session->isGroupSessionType() &&
- gSavedSettings.getString("NotificationGroupChatOptions") != "toast")
+ else if(session->isGroupSessionType()
+ && (gSavedSettings.getString("NotificationGroupChatOptions") != "toast"))
{
return;
}
--
GitLab