Merged 1.2.2 (TPV) into 1.3.

Doesn't have the SL content export notification yet, though.

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 @@
 #include "llappviewer.h" 
 #include "lltransactiontypes.h"
 
+#include "hippoGridManager.h"
+
 #include "primbackup.h" 
 
 #include "llviewerobjectlist.h"
@@ -414,6 +416,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;