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

Space changes.

Browse Source
This commit is contained in:
Lirusaito
2013-02-16 16:35:57 -05:00
committed by Melanie
parent 9e6e801d49
commit d269b66623
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
indra/newview/llpanelpermissions.cpp
View File

@@ -713,37 +713,37 @@ void LLPanelPermissions::refresh()
if (can_export) if (can_export)
{ {
if (can_export = (base_mask_on & PERM_EXPORT && owner_mask_on & PERM_EXPORT && everyone_mask_on & PERM_ITEM_UNRESTRICTED)) //Base & Owner must have EXPORT, Everyone must be UNRESTRICTED if (can_export = (base_mask_on & PERM_EXPORT && owner_mask_on & PERM_EXPORT && everyone_mask_on & PERM_ITEM_UNRESTRICTED)) //Base & Owner must have EXPORT, Everyone must be UNRESTRICTED
{
LLInventoryObject::object_list_t objects;
objectp->getInventoryContents(objects);
for (LLInventoryObject::object_list_t::iterator i = objects.begin(); i != objects.end(); ++i) //The object's inventory must have EXPORT.
{ {
LLInventoryObject::object_list_t objects; LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(i->get()); //getInventoryContents() filters out categories, static_cast.
objectp->getInventoryContents(objects); const LLPermissions& perm = item->getPermissions();
for (LLInventoryObject::object_list_t::iterator i = objects.begin(); i != objects.end(); ++i) //The object's inventory must have EXPORT. if (!(perm.getMaskBase() & PERM_EXPORT && (perm.getMaskOwner() & PERM_EXPORT || perm.getMaskEveryone() & PERM_EXPORT)))
{ {
LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(i->get()); //getInventoryContents() filters out categories, static_cast. can_export = false;
const LLPermissions& perm = item->getPermissions(); break;
if (!(perm.getMaskBase() & PERM_EXPORT && (perm.getMaskOwner() & PERM_EXPORT || perm.getMaskEveryone() & PERM_EXPORT)))
{
can_export = false;
break;
}
} }
if (can_export) }
for (U8 i = 0; i < objectp->getNumTEs(); ++i) // Can the textures be exported? if (can_export)
if (LLTextureEntry* texture = objectp->getTE(i)) for (U8 i = 0; i < objectp->getNumTEs(); ++i) // Can the textures be exported?
if (LLTextureEntry* texture = objectp->getTE(i))
{
const LLUUID id = texture->getID();
if (id.isNull()) continue; // Don't permission-check null textures
else if (LLViewerInventoryItem* item = gInventory.getItem(id))
{ {
const LLUUID id = texture->getID(); const LLPermissions& perm = item->getPermissions();
if (id.isNull()) continue; // Don't permission-check null textures can_export = perm.getMaskBase() & PERM_EXPORT && (perm.getMaskOwner() & PERM_EXPORT || perm.getMaskEveryone() & PERM_EXPORT);
else if (LLViewerInventoryItem* item = gInventory.getItem(id)) if (!can_export) break;
{
const LLPermissions& perm = item->getPermissions();
can_export = perm.getMaskBase() & PERM_EXPORT && (perm.getMaskOwner() & PERM_EXPORT || perm.getMaskEveryone() & PERM_EXPORT);
if (!can_export) break;
}
else // Texture not in inventory
{
can_export = false;
break;
}
} }
else // Texture not in inventory
{
can_export = false;
break;
}
}
} }
} }
childSetEnabled("checkbox allow export", can_export); childSetEnabled("checkbox allow export", can_export);