Index: src/cgame/cg_servercmds.c
===================================================================
--- src/cgame/cg_servercmds.c	(.../svn://svn.icculus.org/tremulous/trunk)	(revision 802)
+++ src/cgame/cg_servercmds.c	(.../trunk)	(working copy)
@@ -584,15 +584,27 @@
     case MN_H_ARMOURY:  trap_SendConsoleCommand( "menu tremulous_humanarmoury\n" ); break;
 
     case MN_A_TEAMFULL:
-      trap_Cvar_Set( "ui_dialog", "The alien team has too many players. Please wait until "
+      if( !cg_disableWarningDialogs.integer )
+      {
+       trap_Cvar_Set( "ui_dialog", "The alien team has too many players. Please wait until "
                                   "slots become available or join the human team." );
-      trap_SendConsoleCommand( "menu tremulous_alien_dialog\n" );
+       trap_SendConsoleCommand( "menu tremulous_alien_dialog\n" );
+      }
+      else
+        CG_Printf( "The alien team has too many players\n" );
+
       break;
 
     case MN_H_TEAMFULL:
-      trap_Cvar_Set( "ui_dialog", "The human team has too many players. Please wait until "
+      if( !cg_disableWarningDialogs.integer )
+      {
+       trap_Cvar_Set( "ui_dialog", "The human team has too many players. Please wait until "
                                   "slots become available or join the alien team." );
-      trap_SendConsoleCommand( "menu tremulous_human_dialog\n" );
+       trap_SendConsoleCommand( "menu tremulous_human_dialog\n" );
+      }
+      else
+        CG_Printf( "The human team has too many players\n" );
+
       break;
 
     case MN_H_NOROOM: