diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-08 23:23:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-08 23:23:58 -0400 |
| commit | f8a2b67649416267cf86d4ff4568e59cdbaaa5c7 (patch) | |
| tree | 8bf5c84b6f7f95c449942a3ddff8b536f0952a1e /indra | |
| parent | 1d0575bcc4d2740dc4b6e7009b6788ac88744eb5 (diff) | |
| parent | 881a215535d7bd3b9efc55b9f36722ceec4ccef1 (diff) | |
merge changes for storm-1060
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | 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 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 07382e8e85..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 == '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 : |