Merged 1.2.2 (TPV) into 1.3.

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

2 files changed, 37 insertions, 2 deletions

diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index df0ac63..7b91e4f 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -4,6 +4,30 @@
 
 
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  =-                         1.2.2                          -=
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+   Imprudence 1.2.2 is a small maintenance release to attempt to make
+   the viewer compliant with the new Second Life Terms of Service and
+   the Policy on Third Party Viewers.
+
+   Please see the Imprudence 1.2.0 Release Notes for information about
+   the changes in Imprudence 1.2.
+
+
+   CHANGES
+
+     * The object export feature no longer downloads textures from
+       Second Life. Other grids are not affected.
+
+     * The viewer now sends the correct version number when loading
+       login splash page. It now sends the Imprudence version, instead
+       of the version of Second Life it was based on.
+
+
+
+
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   =-                     1.3.0 BETA 2                       -=
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
@@ -31,8 +55,8 @@
           etc.
 
      * SpeedRez. After teleporting, the viewer will temporarily
-       decrease the draw distance to encourage nearby objects and
-       textures to rez first. Thanks for the patch, Henri Beauchamp!
+       decrease the draw distance to encourage nearby objects and 
+      textures to rez first. Thanks for the patch, Henri Beauchamp!
 
         - You can disable this feature by setting the SpeedRez debug
           setting to FALSE, or adjust the timing by editing the
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;