From 881a215535d7bd3b9efc55b9f36722ceec4ccef1 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 8 Aug 2011 23:23:34 -0400
Subject: [PATCH] more idiosyncracies for beta channel
---
indra/newview/CMakeLists.txt | 5 ++++-
indra/newview/viewer_manifest.py | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f87ecbd2f5a..f6ebf331bb0 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1249,10 +1249,13 @@ if (WINDOWS)
endif(USE_PRECOMPILED_HEADERS)
# Replace the icons with the appropriate ones for the channel
+ # ('test' is the default)
set(ICON_PATH "test")
string(TOLOWER ${VIEWER_CHANNEL} channel_lower)
- if(channel_lower MATCHES "^(release|beta|development)")
+ if(channel_lower MATCHES "^(release|development)")
set(ICON_PATH ${channel_lower})
+ elseif(channel_lower MATCHES "^(beta.*)")
+ set(ICON_PATH "beta")
elseif(channel_lower MATCHES "^(project.*)")
set(ICON_PATH "project")
endif()
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 07382e8e859..37099bf29b9 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -147,10 +147,11 @@ def icon_path(self):
icon_path="icons/"
channel_type=self.channel_lowerword()
if channel_type == 'release' \
- or channel_type == 'betaviewer' \
or channel_type == 'development' \
:
icon_path += channel_type
+ elif channel_type == 'betaviewer' :
+ icon_path += 'beta'
elif re.match('project.*',channel_type) :
icon_path += 'project'
else :
--
GitLab