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

Bits and pieces

Browse Source 
Disable next owner perms boxes when PERM_EXPORT
Added checks disabling the export toggle conditionally.
All cases covered except textures, couldn't figure that one out...
Mind the TODO's in the diff..
This commit is contained in:
Lirusaito
2013-02-16 04:05:58 -05:00
committed by Melanie
parent 11604ae5de
commit c67563dfe4
2 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llfloaterproperties.cpp
View File

@@ -524,7 +524,8 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
childSetEnabled("CheckEveryoneCopy",false);
childSetEnabled("CheckEveryoneMove",false);
}
childSetEnabled("CheckExport", gAgent.getID() == item->getCreatorUUID());
childSetEnabled("CheckExport", /*simSupportsExport() &&*/ item->getType() != LLAssetType::AT_OBJECT && gAgent.getID() == item->getCreatorUUID() //TODO: Implement Simulator Feature for Export.
&& !(base_mask & PERM_EXPORT && owner_mask & PERM_EXPORT && next_owner_mask & PERM_ITEM_UNRESTRICTED));
// Set values.
BOOL is_group_copy = (group_mask & PERM_COPY) ? TRUE : FALSE;
@@ -552,10 +553,11 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
childSetEnabled("SaleLabel",is_complete);
childSetEnabled("CheckPurchase",is_complete);
childSetEnabled("NextOwnerLabel",TRUE);
childSetEnabled("CheckNextOwnerModify",base_mask & PERM_MODIFY);
childSetEnabled("CheckNextOwnerCopy",base_mask & PERM_COPY);
childSetEnabled("CheckNextOwnerTransfer",next_owner_mask & PERM_COPY);
bool no_export = !(everyone_mask & PERM_EXPORT); // Next owner perms can't be changed if set
childSetEnabled("NextOwnerLabel", no_export);
childSetEnabled("CheckNextOwnerModify", no_export && base_mask & PERM_MODIFY);
childSetEnabled("CheckNextOwnerCopy", no_export && base_mask & PERM_COPY);
childSetEnabled("CheckNextOwnerTransfer", no_export && next_owner_mask & PERM_COPY);
childSetEnabled("RadioSaleType",is_complete && is_for_sale);
childSetEnabled("TextPrice",is_complete && is_for_sale);