From 9dda742166db45fb5fb3cb67389bccfb5b22c701 Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sat, 15 Jan 2011 22:34:27 -0500
Subject: [PATCH] Mac Build: Remove redundant channel in disk image name when
 doing custom channels

---
 indra/newview/viewer_manifest.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 748fb78479..3bbca42022 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -729,20 +729,20 @@ class DarwinManifest(ViewerManifest):
         if not self.default_channel():
             channel_standin = self.channel()
 
-        imagename="Phoenix_Firestorm_" + '_'.join(self.args['version'])
+        imagename="Phoenix_" + self.channel_oneword() + '_' + '_'.join(self.args['version'])
 
         # MBW -- If the mounted volume name changes, it breaks the .DS_Store's background image and icon positioning.
         #  If we really need differently named volumes, we'll need to create multiple DS_Store file images, or use some other trick.
 
         volname="Firestorm Installer"  # DO NOT CHANGE without understanding comment above
 
-        if self.default_channel():
-            if not self.default_grid():
-                # beta case
-                imagename = imagename + '_' + self.args['grid'].upper()
-        else:
-            # first look, etc
-            imagename = imagename + '_' + self.channel_oneword().upper()
+        #if self.default_channel():
+        #    if not self.default_grid():
+        #        # beta case
+        #        imagename = imagename + '_' + self.args['grid'].upper()
+        #else:
+        #    # first look, etc
+        #    imagename = imagename + '_' + self.channel_oneword().upper()
 
         sparsename = imagename + ".sparseimage"
         finalname = imagename + ".dmg"