From 46b5595c3f8ed4de34ca743aadd1b8b9499e7b35 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Sun, 16 Dec 2012 15:29:36 -0500 Subject: [PATCH] Don't leave Group Copy check enabled unless we have trans and copy perms. Also some code consistency chages that won't change anything. --- indra/newview/llfloaterproperties.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp index 3e279936f..0c8e7914e 100644 --- a/indra/newview/llfloaterproperties.cpp +++ b/indra/newview/llfloaterproperties.cpp @@ -537,11 +537,11 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item) if (!is_link && is_obj_modify && can_agent_manipulate) { childSetEnabled("GroupLabel", true); - childSetEnabled("CheckGroupCopy",owner_mask & PERM_TRANSFER); + childSetEnabled("CheckGroupCopy", (owner_mask & (PERM_TRANSFER|PERM_COPY)) == (PERM_TRANSFER|PERM_COPY)); childSetEnabled("CheckGroupMod", owner_mask & PERM_MODIFY); childSetEnabled("CheckGroupMove", true); childSetEnabled("EveryoneLabel", true); - childSetEnabled("CheckEveryoneCopy",(owner_mask & PERM_COPY) && (owner_mask & PERM_TRANSFER)); + childSetEnabled("CheckEveryoneCopy", (owner_mask & (PERM_TRANSFER|PERM_COPY)) == (PERM_TRANSFER|PERM_COPY)); childSetEnabled("CheckEveryoneMove",true); } else @@ -551,7 +551,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item) childSetEnabled("CheckGroupMod", false); childSetEnabled("CheckGroupMove", false); childSetEnabled("EveryoneLabel", false); - childSetEnabled("CheckEveryoneCopy",FALSE); + childSetEnabled("CheckEveryoneCopy",false); childSetEnabled("CheckEveryoneMove",false); }