Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't leave Group Copy check enabled unless we have trans and copy perms.

Browse Source 
Also some code consistency chages that won't change anything.
This commit is contained in:
Inusaito Sayori
2012-12-16 15:29:36 -05:00
parent c380f1f399
commit 46b5595c3f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloaterproperties.cpp
View File

@@ -537,11 +537,11 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
if (!is_link && is_obj_modify && can_agent_manipulate) if (!is_link && is_obj_modify && can_agent_manipulate)
{ {
childSetEnabled("GroupLabel", true); 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("CheckGroupMod", owner_mask & PERM_MODIFY);
childSetEnabled("CheckGroupMove", true); childSetEnabled("CheckGroupMove", true);
childSetEnabled("EveryoneLabel", 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); childSetEnabled("CheckEveryoneMove",true);
} }
else else
@@ -551,7 +551,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
childSetEnabled("CheckGroupMod", false); childSetEnabled("CheckGroupMod", false);
childSetEnabled("CheckGroupMove", false); childSetEnabled("CheckGroupMove", false);
childSetEnabled("EveryoneLabel", false); childSetEnabled("EveryoneLabel", false);
childSetEnabled("CheckEveryoneCopy",FALSE); childSetEnabled("CheckEveryoneCopy",false);
childSetEnabled("CheckEveryoneMove",false); childSetEnabled("CheckEveryoneMove",false);
} }