aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2010-04-27 20:02:48 -0500
committerJacek Antonelli2010-04-28 02:02:04 -0500
commitaef0673899b1b60b6829487ca0bc384cfc114855 (patch)
tree3f801346e54d8ec428d3bb2694d05cda97fa91f7
parentReverted boost to 1.36 on 32bit Linux (like in the main branch). (diff)
downloadmeta-impy-aef0673899b1b60b6829487ca0bc384cfc114855.zip
meta-impy-aef0673899b1b60b6829487ca0bc384cfc114855.tar.gz
meta-impy-aef0673899b1b60b6829487ca0bc384cfc114855.tar.bz2
meta-impy-aef0673899b1b60b6829487ca0bc384cfc114855.tar.xz
Disabled exporting object textures when connected to SL.
Exporting object textures (or other content) from Second Life without checking creator is a violation of the Second Life Policy on Third-Party Viewers and Terms of Service.
-rw-r--r--linden/indra/newview/primbackup.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index 8dbf1df..240f498 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -61,6 +61,8 @@
61#include "llappviewer.h" 61#include "llappviewer.h"
62#include "lltransactiontypes.h" 62#include "lltransactiontypes.h"
63 63
64#include "hippoGridManager.h"
65
64#include "primbackup.h" 66#include "primbackup.h"
65 67
66#include "llviewerobjectlist.h" 68#include "llviewerobjectlist.h"
@@ -421,6 +423,15 @@ void primbackup::exportworker(void *userdata)
421 } 423 }
422 424
423 case EXPORT_TEXTURES: { 425 case EXPORT_TEXTURES: {
426 // Exporting object textures (or other content) from Second Life
427 // without checking creator is a violation of the Second Life
428 // Policy on Third-Party Viewers and Terms of Service.
429 if(gHippoGridManager->getConnectedGrid()->isSecondLife())
430 {
431 primbackup::getInstance()->export_state=EXPORT_DONE;
432 return;
433 }
434
424 if(primbackup::getInstance()->m_nexttextureready==false) 435 if(primbackup::getInstance()->m_nexttextureready==false)
425 return; 436 return;
426 437