3 files changed, 54 insertions, 20 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index db9de23..f8604f8 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -355,6 +355,14 @@
                 modified:   linden/indra/newview/llpanelavatar.cpp
                 
                 
+2009-09-09  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Commented out Linux tarball building.
+          It's a waste of time to package after every compile.
+
+                modified:   linden/indra/newview/viewer_manifest.py
+
+
 2009-09-08  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Created my own version of Emerald's chat channel tool. 
@@ -457,10 +465,22 @@
 
         * Fixed ground sit menu entry missing check.
 
+<<<<<<< HEAD
+=======
+                modified:   linden/indra/newview/llviewermenu.cpp
+                modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+2009-09-05  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Converted RLVa menu items to XUI.
+
+>>>>>>> mccabe/1.2.0-next
                 modified:   linden/indra/newview/llviewermenu.cpp
                 modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
 
 
+<<<<<<< HEAD
 2009-09-05  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * Converted RLVa menu items to XUI.
@@ -469,6 +489,8 @@
                 modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
 
 
+=======
+>>>>>>> mccabe/1.2.0-next
 2009-09-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index cac35b9..9ef56c1 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -388,6 +388,16 @@ void LLNetMap::draw()
                         }
 // [/RLVa:KB]
 
+// [RLVa:KB]
+                        if ( !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
+                        {
+                                // User is not allowed to see who it is, or even if it's a friend,
+                                // due to RLV settings.
+                                glyph_color = avatar_color;
+                        }
+// [/RLVa:KB]
+
+
                         LLWorldMapView::drawAvatar(
                                 pos_map.mV[VX], pos_map.mV[VY], 
                                 glyph_color, 
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 5da0256..6ae5b80 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -746,26 +746,28 @@ class LinuxManifest(ViewerManifest):
 
         self.package_file = installer_name + '.tar.bz2'
 
-        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)})
+        # Disabled for now. It's a waste of time to package every compile.
+
+        # 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):