livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1060

meow-7.2.2
Oz Linden 2011-08-08 23:23:58 -04:00
parent 1d0575bcc4 881a215535
commit f8a2b67649
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/CMakeLists.txt
View File

@ -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()

3
indra/newview/viewer_manifest.py
View File

@ -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 :