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

Revert "Handle PERM_EXPORT in LLPermissions."

Browse Source 
This reverts commit 9c71afe73e.
This commit is contained in:
Aleric Inglewood
2013-07-22 19:49:00 +02:00
parent 937322cc93
commit be6699198f
11 changed files with 59 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llviewerobjectbackup.cpp
View File

@@ -398,7 +398,18 @@ void LLObjectBackup::exportObject_continued(AIFilePicker* filepicker)
bool LLObjectBackup::validatePerms(const LLPermissions *item_permissions)
{
return item_permissions->allowExportBy(gAgent.getID());
if (gHippoGridManager->getConnectedGrid()->isSecondLife())
{
// In Second Life, you must be the creator to be permitted to export the asset.
return (gAgent.getID() == item_permissions->getOwner() &&
gAgent.getID() == item_permissions->getCreator());
}
else
{
// Out of Second Life, simply check that the asset is full perms.
return (gAgent.getID() == item_permissions->getOwner() &&
(item_permissions->getMaskOwner() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED);
}
}
// So far, only Second Life forces TPVs to verify the creator for textures...