Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 24ae90e3ae..b86d4214d6 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -118,7 +118,7 @@ public:
         }
 
         LLUUID group_id;
-        if (!group_id.set(tokens[0], FALSE))
+        if (!group_id.set(tokens[0], false))
         {
             return false;
         }
@@ -186,7 +186,7 @@ public:
             }
             else if (!gdatap->isMemberDataComplete())
             {
-                LL_WARNS() << "LLGroupMgr::getInstance()->getGroupData()->isMemberDataComplete() was FALSE" << LL_ENDL;
+                LL_WARNS() << "LLGroupMgr::getInstance()->getGroupData()->isMemberDataComplete() was false" << LL_ENDL;
                 processGroupData();
                 mRequestProcessed = true;
             }
@@ -370,8 +370,8 @@ void LLGroupActions::processLeaveGroupDataResponse(const LLUUID group_id)
     if (gdatap->mMembershipFee > 0)
     {
         args["COST"] = gdatap->mMembershipFee;
-        LLNotificationsUtil::add("GroupLeaveConfirmMember", args, payload, onLeaveGroup);
-    }
+    LLNotificationsUtil::add("GroupLeaveConfirmMember", args, payload, onLeaveGroup);
+}
     else
     {
         LLNotificationsUtil::add("GroupLeaveConfirmMemberNoFee", args, payload, onLeaveGroup);
@@ -425,7 +425,7 @@ void LLGroupActions::show(const LLUUID &group_id, bool expand_notices_tab)
     LLFloater *floater = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>("people");
     if (!floater->isFrontmost())
     {
-        floater->setVisibleAndFrontmost(TRUE, params);
+        floater->setVisibleAndFrontmost(true, params);
     }
 }