Updated to SL source 1.21.2.

Conflicts:
	linden/indra/SConstruct
	linden/indra/newview/files.lst
	linden/indra/newview/llfloatertools.cpp
	linden/indra/newview/llfloatertools.h
	linden/indra/newview/lloverlaybar.cpp
	linden/indra/newview/lloverlaybar.h
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
	linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
	linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
	linden/indra/newview/viewer_manifest.py

1 files changed, 20 insertions, 15 deletions

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 718d6e6..fe894a7 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -570,25 +570,30 @@ class LinuxManifest(ViewerManifest):
                 find %(dst)s -type f -perm 0600 | xargs --no-run-if-empty chmod 0644;
                 find %(dst)s -type f -perm 0400 | xargs --no-run-if-empty chmod 0444;
                 true""" %  {'dst':self.get_dst_prefix() })
+
         self.package_file = installer_name + '.tar.bz2'
 
-        # temporarily move directory tree so that it has the right
-        # name in the tarfile
-        self.run_command("mv %(dst)s %(inst)s" % {
-            'dst': self.get_dst_prefix(),
-            'inst': self.build_path_of(installer_name)})
-        try:
-            # --numeric-owner hides the username of the builder for
-            # security etc.
-            self.run_command('tar -C %(dir)s --numeric-owner -cjf '
-                             '%(inst_path)s.tar.bz2 %(inst_name)s' % {
-                'dir': self.get_build_prefix(),
-                'inst_name': installer_name,
-                'inst_path':self.build_path_of(installer_name)})
-        finally:
-            self.run_command("mv %(inst)s %(dst)s" % {
+        if("package" in self.args['actions'] or
+           "unpacked" in self.args['actions']):
+
+            # temporarily move directory tree so that it has the right
+            # name in the tarfile
+            self.run_command("mv %(dst)s %(inst)s" % {
                 'dst': self.get_dst_prefix(),
                 'inst': self.build_path_of(installer_name)})
+            try:
+                # --numeric-owner hides the username of the builder for
+                # security etc.
+                self.run_command('tar -C %(dir)s --numeric-owner -cjf '
+                                 '%(inst_path)s.tar.bz2 %(inst_name)s' % {
+                    'dir': self.get_build_prefix(),
+                    'inst_name': installer_name,
+                    'inst_path':self.build_path_of(installer_name)})
+            finally:
+                self.run_command("mv %(inst)s %(dst)s" % {
+                    'dst': self.get_dst_prefix(),
+                    'inst': self.build_path_of(installer_name)})
+
 
 class Linux_i686Manifest(LinuxManifest):
     def construct(self):