aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/primbackup.cpp42
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notifications.xml7
2 files changed, 21 insertions, 28 deletions
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index f7f1345..a534cef 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -346,12 +346,32 @@ void primbackup::pre_export_object()
346} 346}
347 347
348 348
349// This is the central place where exporting permissions checks are done.
350
349// static 351// static
350bool primbackup::check_perms( LLSelectNode* node ) 352bool primbackup::check_perms( LLSelectNode* node )
351{ 353{
352 LLPermissions *perms = node->mPermissions; 354 LLPermissions *perms = node->mPermissions;
355
356 // Exporting other content) from Second Life
357 // without checking creator is a violation of the Second Life
358 // Policy on Third-Party Viewers and Terms of Service.
359 // Coz LL are paranoid about other grids getting useful content.
360 // This is probably illegal with respect to open source content,
361 // it usually has licenses designed to prevent third parties (LL)
362 // from restricting copying.
363 // This is the meta-impy viewer, we don't care about LL's broken policies
364 // and we really don't care for LL imposing their own restrictions
365 // on content that the content author did not want.
366 if(gHippoGridManager->getConnectedGrid()->isSecondLife())
367 {
368 return (gAgent.getID() == perms->getOwner() &&
369 gAgent.getID() == perms->getCreator() &&
370 (PERM_ITEM_UNRESTRICTED &
371 perms->getMaskOwner()) == PERM_ITEM_UNRESTRICTED);
372 }
373
353 return (gAgent.getID() == perms->getOwner() && 374 return (gAgent.getID() == perms->getOwner() &&
354 gAgent.getID() == perms->getCreator() &&
355 (PERM_ITEM_UNRESTRICTED & 375 (PERM_ITEM_UNRESTRICTED &
356 perms->getMaskOwner()) == PERM_ITEM_UNRESTRICTED); 376 perms->getMaskOwner()) == PERM_ITEM_UNRESTRICTED);
357} 377}
@@ -377,10 +397,6 @@ void primbackup::exportworker(void *userdata)
377 397
378 if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false)) 398 if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false))
379 { 399 {
380 if(gHippoGridManager->getConnectedGrid()->isSecondLife())
381 {
382 LLNotifications::instance().add("NoTextureExportSL");
383 }
384 primbackup::getInstance()->export_state=EXPORT_STRUCTURE; 400 primbackup::getInstance()->export_state=EXPORT_STRUCTURE;
385 } 401 }
386 else 402 else
@@ -420,22 +436,6 @@ void primbackup::exportworker(void *userdata)
420 } 436 }
421 437
422 case EXPORT_TEXTURES: { 438 case EXPORT_TEXTURES: {
423 // Exporting object textures (or other content) from Second Life
424 // without checking creator is a violation of the Second Life
425 // Policy on Third-Party Viewers and Terms of Service.
426 // Coz LL are paranoid about other grids getting useful content.
427 // This is probably illegal with respect to open source content,
428 // it usually has licenses designed to prevent third parties (LL)
429 // from restricting copying.
430 // This is the meta-impy viewer, we don't care about LL's broken policies
431 // and we really don't care for LL imposing their own restrictions
432 // on content that the content author did not want.
433// if(gHippoGridManager->getConnectedGrid()->isSecondLife())
434// {
435// primbackup::getInstance()->export_state=EXPORT_DONE;
436// return;
437// }
438
439 if(primbackup::getInstance()->m_nexttextureready==false) 439 if(primbackup::getInstance()->m_nexttextureready==false)
440 return; 440 return;
441 441
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 9ff00a4..5132050 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7280,13 +7280,6 @@ Shadows cannot be enabled due to your graphics settings being set too low. Make
7280</notification> 7280</notification>
7281 7281
7282<notification 7282<notification
7283 icon="notifytip.tga"
7284 name="NoTextureExportSL"
7285 type="notifytip">
7286Note: To comply with the Second Life Terms of Service, Imprudence did not download any texture files for the exported object(s).
7287</notification>
7288
7289<notification
7290 icon="alert.tga" 7283 icon="alert.tga"
7291 name="Help_CmdLine" 7284 name="Help_CmdLine"
7292 type="alert"> 7285 type="alert">