add menu bar background colors for new build/channel scheme

2 files changed, 42 insertions, 18 deletions

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 48a69129eb..8c72421888 100755
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2235,29 +2235,42 @@ void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
 
 	// no l10n problem because channel is always an english string
 	std::string channel = LLVersionInfo::getChannel();
-	bool isProject = (channel.find("Project") != std::string::npos);
+	bool isProject = (channel.find("Project") != std::string::npos); // TBD - should be a regex
+	bool isBeta = (channel.find("Beta") != std::string::npos); // TBD - should be a regex
+	bool isTest = (channel.find("Test") != std::string::npos); // TBD - should be a regex
 	
 	// god more important than project, proj more important than grid
-    if(god_mode && LLGridManager::getInstance()->isInProductionGrid())
+    if ( god_mode ) 
     {
-        new_bg_color = LLUIColorTable::instance().getColor( "MenuBarGodBgColor" );
-    }
-    else if(god_mode && !LLGridManager::getInstance()->isInProductionGrid())
-    {
-        new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionGodBgColor" );
+		if ( LLGridManager::getInstance()->isInProductionGrid() )
+		{
+			new_bg_color = LLUIColorTable::instance().getColor( "MenuBarGodBgColor" );
+		}
+		else
+		{
+			new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionGodBgColor" );
+		}
     }
-	else if (!god_mode && isProject)
+	else if (isBeta)
+	{
+		new_bg_color = LLUIColorTable::instance().getColor( "MenuBarBetaBgColor" );
+	}
+	else if (isProject)
 	{
 		new_bg_color = LLUIColorTable::instance().getColor( "MenuBarProjectBgColor" );
-    }
-    else if(!god_mode && !LLGridManager::getInstance()->isInProductionGrid())
-    {
-        new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionBgColor" );
-    }
-    else 
-    {
-        new_bg_color = LLUIColorTable::instance().getColor( "MenuBarBgColor" );
-    }
+	}
+	else if (isTest)
+	{
+		new_bg_color = LLUIColorTable::instance().getColor( "MenuBarTestBgColor" );
+	}
+	else if(!LLGridManager::getInstance()->isInProductionGrid())
+	{
+		new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionBgColor" );
+	}
+	else 
+	{
+		new_bg_color = LLUIColorTable::instance().getColor( "MenuBarBgColor" );
+	}
 
     if(gMenuBarView)
     {
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 9bf2922033..02e2ad2ff7 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -99,6 +99,9 @@
       name="MdBlue"
       value=".07 .38 .51 1" />
   <color
+      name="DkBlue"
+      value=".06 .06 .3 1" />
+  <color
       name="LtRed"
       value="1 0.2 0.2 1" />
   <color
@@ -108,6 +111,9 @@
       name="Red_80"
       value="1 0 0 0.8" />
   <color
+      name="DkRed"
+      value="0.3 0.06 0.06 1" />
+  <color
       name="Green_80"
       value="0 1 0 0.8" />
   <color
@@ -824,9 +830,14 @@
       name="ChatTimestampColor"
       reference="White" />
   <color
+      name="MenuBarBetaBgColor"
+      reference="DkBlue" />
+  <color
       name="MenuBarProjectBgColor"
       reference="MdBlue" />
-  
+  <color
+      name="MenuBarTestBgColor"
+      reference="DkRed" />
   <color
       name="MeshImportTableNormalColor"
       value="1 1 1 1"/>