From aef0673899b1b60b6829487ca0bc384cfc114855 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Tue, 27 Apr 2010 20:02:48 -0500 Subject: 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. --- linden/indra/newview/primbackup.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'linden/indra/newview/primbackup.cpp') 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 @@ #include "llappviewer.h" #include "lltransactiontypes.h" +#include "hippoGridManager.h" + #include "primbackup.h" #include "llviewerobjectlist.h" @@ -421,6 +423,15 @@ void primbackup::exportworker(void *userdata) } case EXPORT_TEXTURES: { + // 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. + if(gHippoGridManager->getConnectedGrid()->isSecondLife()) + { + primbackup::getInstance()->export_state=EXPORT_DONE; + return; + } + if(primbackup::getInstance()->m_nexttextureready==false) return; -- cgit v1.1