From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 10 Apr 2012 19:01:58 +0000 (-0500)
Subject: add updated conf
X-Git-Tag: v1.2-rc1~17^2~259
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f209ae0191bd2ab09fc76fa4dd7795827951feb6;p=thirdparty%2Ffreeswitch.git

add updated conf
---

diff --git a/conf/vanilla/autoload_configs/conference.conf.xml b/conf/vanilla/autoload_configs/conference.conf.xml
index 5a906f91cd..30e298a09c 100644
--- a/conf/vanilla/autoload_configs/conference.conf.xml
+++ b/conf/vanilla/autoload_configs/conference.conf.xml
@@ -120,6 +120,8 @@
       <!-- <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"/> -->
     </profile>
 
     <profile name="wideband">