aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview')
-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 3ab5ee1..5b704f1 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -54,6 +54,8 @@
54#include "llappviewer.h" 54#include "llappviewer.h"
55#include "lltransactiontypes.h" 55#include "lltransactiontypes.h"
56 56
57#include "hippoGridManager.h"
58
57#include "primbackup.h" 59#include "primbackup.h"
58 60
59#include "llviewerobjectlist.h" 61#include "llviewerobjectlist.h"
@@ -414,6 +416,15 @@ void primbackup::exportworker(void *userdata)
414 } 416 }
415 417
416 case EXPORT_TEXTURES: { 418 case EXPORT_TEXTURES: {
419 // Exporting object textures (or other content) from Second Life
420 // without checking creator is a violation of the Second Life
421 // Policy on Third-Party Viewers and Terms of Service.
422 if(gHippoGridManager->getConnectedGrid()->isSecondLife())
423 {
424 primbackup::getInstance()->export_state=EXPORT_DONE;
425 return;
426 }
427
417 if(primbackup::getInstance()->m_nexttextureready==false) 428 if(primbackup::getInstance()->m_nexttextureready==false)
418 return; 429 return;
419 430