Merge with tip of viewer-release

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index caf26be30f..b6212e0958 100755
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2348,15 +2348,15 @@ void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
 		}
     }
     else
-	{
+    {
         switch (LLVersionInfo::getViewerMaturity())
-	{
+        {
         case LLVersionInfo::TEST_VIEWER:
             new_bg_color = LLUIColorTable::instance().getColor( "MenuBarTestBgColor" );
             break;
 
         case LLVersionInfo::PROJECT_VIEWER:
-		new_bg_color = LLUIColorTable::instance().getColor( "MenuBarProjectBgColor" );
+            new_bg_color = LLUIColorTable::instance().getColor( "MenuBarProjectBgColor" );
             break;
             
         case LLVersionInfo::BETA_VIEWER:
@@ -2365,13 +2365,13 @@ void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
             
         case LLVersionInfo::RELEASE_VIEWER:
             if(!LLGridManager::getInstance()->isInProductionGrid())
-	{
-		new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionBgColor" );
-	}
-	else 
-	{
-		new_bg_color = LLUIColorTable::instance().getColor( "MenuBarBgColor" );
-	}
+            {
+                new_bg_color = LLUIColorTable::instance().getColor( "MenuNonProductionBgColor" );
+            }
+            else 
+            {
+                new_bg_color = LLUIColorTable::instance().getColor( "MenuBarBgColor" );
+            }
             break;
         }
     }