From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 22 Nov 2017 20:21:50 +0000 (-0600)
Subject: FS-10803: [mod_conference] Add support for alternate video layout config per conferen... 
X-Git-Tag: v1.8.1~3^2~185
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=376cc03f58694fd042addeebe2bd9ff7f86bad7a;p=thirdparty%2Ffreeswitch.git

FS-10803: [mod_conference] Add support for alternate video layout config per conference profile
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 6fa1c7dc7c..1f3eaed838 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -4534,12 +4534,6 @@ void conference_video_set_floor_holder(conference_obj_t *conference, conference_
 		return;
 	}
 
-	if (member && member->video_role_id) {
-		/* no video floor when a role id is set */
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Setting floor not allowed on a member with a role id\n");
-		return;
-	}
-
 	if ((!force && conference_utils_test_flag(conference, CFLAG_VID_FLOOR_LOCK))) {
 		return;
 	}