Commits

Scott Lawrence committed 8439597

more idiosyncracies for beta channel

Comments (0)

Files changed (2)

indra/newview/CMakeLists.txt

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

indra/newview/viewer_manifest.py

         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 :