aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-10-03 01:11:48 -0700
committerMcCabe Maxsted2010-10-03 01:11:48 -0700
commitdfeb8fe3f4110f7e571ababf35401ea6a5fd41d5 (patch)
tree092c1ba2f38eeeeffe954c2c8a020df1805d3bb1
parentFixed #157: Group lists get merged after logging into multiple grids (diff)
downloadmeta-impy-dfeb8fe3f4110f7e571ababf35401ea6a5fd41d5.zip
meta-impy-dfeb8fe3f4110f7e571ababf35401ea6a5fd41d5.tar.gz
meta-impy-dfeb8fe3f4110f7e571ababf35401ea6a5fd41d5.tar.bz2
meta-impy-dfeb8fe3f4110f7e571ababf35401ea6a5fd41d5.tar.xz
Allow export of megaprims from SL by people who've given us permission
-rw-r--r--linden/indra/newview/primbackup.cpp31
1 files changed, 28 insertions, 3 deletions
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index 63043f0..adbc4de 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -350,6 +350,34 @@ void primbackup::pre_export_object()
350bool primbackup::check_perms( LLSelectNode* node ) 350bool primbackup::check_perms( LLSelectNode* node )
351{ 351{
352 LLPermissions *perms = node->mPermissions; 352 LLPermissions *perms = node->mPermissions;
353 // We check to see if there are megaprims in SL we can export.
354 // Cludgy, but the only option considering LL's TPV policy.
355 if (gHippoGridManager->getConnectedGrid()->isSecondLife())
356 {
357 bool is_sl_megaprim = false;
358 for (int i = 0; i < 3; ++i)
359 {
360 if (node->getObject()->getScale().mV[i] > 10)
361 {
362 is_sl_megaprim = true;
363 break;
364 }
365 }
366
367 if (is_sl_megaprim)
368 {
369 // The following avatars in Second Life have given Imprudence permission for their full-perm
370 // megaprims to be exported even if that means changing the creator from themselves:
371 // McCabe_Maxsted ("3fc0478f-1c40-48a1-b8a7-3b7062efeda1");
372 // Gene_Replacement ("adfacb56-390b-4fdc-9216-3494f1c59862");
373 return ((perms->getCreator() == LLUUID("3fc0478f-1c40-48a1-b8a7-3b7062efeda1") ||
374 perms->getCreator() == LLUUID("adfacb56-390b-4fdc-9216-3494f1c59862") ||
375 perms->getCreator() == gAgent.getID()) &&
376 perms->getOwner() == gAgent.getID() &&
377 (PERM_ITEM_UNRESTRICTED & perms->getMaskOwner()) == PERM_ITEM_UNRESTRICTED);
378 }
379 }
380
353 return (gAgent.getID() == perms->getOwner() && 381 return (gAgent.getID() == perms->getOwner() &&
354 gAgent.getID() == perms->getCreator() && 382 gAgent.getID() == perms->getCreator() &&
355 (PERM_ITEM_UNRESTRICTED & 383 (PERM_ITEM_UNRESTRICTED &
@@ -1111,7 +1139,4 @@ void primbackup::upload_next_asset()
1111 "Uploaded texture", 1139 "Uploaded texture",
1112 NULL, 1140 NULL,
1113 NULL); 1141 NULL);
1114
1115
1116} 1142}
1117