summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/CMakeLists.txt5
-rw-r--r--indra/newview/viewer_manifest.py3
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 86fbc248b0..7e1d46f0e8 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1253,10 +1253,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 34565835e9..37099bf29b 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -147,10 +147,11 @@ class ViewerManifest(LLManifest):
icon_path="icons/"
channel_type=self.channel_lowerword()
if channel_type == 'release' \
- or channel_type == 'beta' \
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 :