[asterisk-commits] tilghman: branch 1.6.2 r277478 - in /branches/1.6.2: ./ contrib/realtime/mysq...

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jul 16 15:30:40 2010
New Revision: 277478

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=277478
Log:
Merged revisions 277452 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r277452 | tilghman | 2010-07-16 15:25:11 -0500 (Fri, 16 Jul 2010) | 2 lines
  
  Add documentation for MOH realtime fields
........

Added:
    branches/1.6.2/contrib/realtime/mysql/musiconhold.sql
      - copied unchanged from r277452, trunk/contrib/realtime/mysql/musiconhold.sql
Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/res/res_musiconhold.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/res_musiconhold.c?view=diff&rev=277478&r1=277477&r2=277478
==============================================================================
--- branches/1.6.2/res/res_musiconhold.c (original)
+++ branches/1.6.2/res/res_musiconhold.c Fri Jul 16 15:30:40 2010
@@ -1071,9 +1071,12 @@
 		return -1;
 	}
 
+#if 0
+	/* XXX This isn't correct.  Args is an application for custom mode. XXX */
 	if (strchr(class->args, 'r')) {
 		ast_set_flag(class, MOH_RANDOMIZE);
 	}
+#endif
 
 	return 0;
 }