livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-15733 Do not count mesh when calculating oxp objects to export.

Techwolf Lupindo 2015-03-22 17:47:32 -04:00
parent 2a7b1ab96f
commit babb652f48
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/daeexport.cpp
View File

@ -260,7 +260,7 @@ void ColladaExportFloater::addSelectedObjects()
{
mTotal++;
LLSelectNode* node = *iter;
if (!node->getObject()->getVolume() || !FSExportPermsCheck::canExportNode(node)) continue;
if (!node->getObject()->getVolume() || !FSExportPermsCheck::canExportNode(node, true)) continue;
mIncluded++;
mSaver.add(node->getObject(), node->mName);
}

15
indra/newview/fsexportperms.cpp
View File

@ -35,7 +35,7 @@
#define FOLLOW_PERMS 1
bool FSExportPermsCheck::canExportNode(LLSelectNode* node)
bool FSExportPermsCheck::canExportNode(LLSelectNode* node, bool dae)
{
if (!node)
{
@ -97,8 +97,17 @@ bool FSExportPermsCheck::canExportNode(LLSelectNode* node)
{
if(volobjp->isMesh())
{
LLSD mesh_header = gMeshRepo.getMeshHeader(sculpt_params->getSculptTexture());
exportable = mesh_header["creator"].asUUID() == gAgentID;
if (dae)
{
LLSD mesh_header = gMeshRepo.getMeshHeader(sculpt_params->getSculptTexture());
exportable = mesh_header["creator"].asUUID() == gAgentID;
}
else
{
// can not export mesh to oxp
LL_INFOS("export") << "Mesh can not be exported to oxp." << LL_ENDL;
return false;
}
}
else if (sculpt_params)
{

2
indra/newview/fsexportperms.h
View File

@ -31,7 +31,7 @@ const S32 OXP_FORMAT_VERSION = 2;
namespace FSExportPermsCheck
{
bool canExportNode(LLSelectNode* node);
bool canExportNode(LLSelectNode* node, bool dae);
bool canExportAsset(LLUUID asset_id, std::string* name = NULL, std::string* description = NULL);
};

4
indra/newview/fsfloaterexport.cpp
View File

@ -372,7 +372,7 @@ void FSFloaterObjectExport::addPrim(LLViewerObject* object, bool root)
} func(object_id);
LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode(&func);
default_prim = (!FSExportPermsCheck::canExportNode(node));
default_prim = (!FSExportPermsCheck::canExportNode(node, false));
if (root)
{
@ -1155,7 +1155,7 @@ void FSFloaterObjectExport::addSelectedObjects()
{
node = *iter;
mTotal++;
if (!node->getObject()->getVolume() || !FSExportPermsCheck::canExportNode(node)) continue;
if (!node->getObject()->getVolume() || !FSExportPermsCheck::canExportNode(node, false)) continue;
mIncluded++;
addObject(node->getObject(), node->mName);
}