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

15
indra/newview/daeexport.cpp
View File

@@ -65,6 +65,7 @@
#include "boost/date_time/posix_time/posix_time.hpp"
// newview includes
#include "lfsimfeaturehandler.h"
#include "llface.h"
#include "llvovolume.h"
@@ -116,6 +117,18 @@ namespace DAEExportUtil
}
}
bool canExportNode(const LLSelectNode* node)
{
if (const LLPermissions* perms = node->mPermissions)
{
if (gAgentID == perms->getCreator() || (LFSimFeatureHandler::instance().simSupportsExport() && gAgentID == perms->getOwner() && perms->getMaskEveryone() & PERM_EXPORT))
{
return true;
}
}
return false;
}
void saveSelectedObject()
{
static const std::string file_ext = ".dae";
@@ -131,7 +144,7 @@ namespace DAEExportUtil
{
total++;
LLSelectNode* node = *iter;
if (!node->mPermissions->allowExportBy(gAgentID) || !node->getObject()->getVolume()) continue;
if (!canExportNode(node) || !node->getObject()->getVolume()) continue;
included++;
daesaver->Add(node->getObject(), node->mName);
}