From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 11 Apr 2012 13:16:13 +0000 (-0500)
Subject: FS-4088
X-Git-Tag: v1.2-rc1~17^2~248
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=098f1962982f779e56c215be206095ce2c01f56a;p=thirdparty%2Ffreeswitch.git

FS-4088
---

diff --git a/conf/vanilla/autoload_configs/conference.conf.xml b/conf/vanilla/autoload_configs/conference.conf.xml
index 30e298a09c..826f6fb9be 100644
--- a/conf/vanilla/autoload_configs/conference.conf.xml
+++ b/conf/vanilla/autoload_configs/conference.conf.xml
@@ -120,8 +120,10 @@
       <!-- <param name="ivr-input-timeout" value="0" /> -->
       <!-- Delay before a conference is asked to be terminated -->
       <!-- <param name="endconf-grace-time" value="120" /> -->
-      <!-- Set conference flags, separate by "|" -->
-      <!-- <param name="conference-flags" value="wait-mod|video-bridge|video-floor-only"/> -->
+      <!-- Can be | delim of wait-mod|audio-always|video-bridge|video-floor-only
+           wait_mod will wait until the moderator in,
+           audio-always will always mix audio from all members regardless they are talking or not -->
+      <!-- <param name="conference-flags" value="audio-always"/> -->
     </profile>
 
     <profile name="wideband">