FS-10196: [mod_conference] Layer collision when an avatar user has a role-id #resolve

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 9df71b3e6e5b4c02d144974b01c6897efe580d86..9209532af2db54875854681123b7bb5cb3d16f4c 100644 (file)
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -2494,7 +2494,7 @@ switch_status_t conference_video_find_layer(conference_obj_t *conference, mcu_ca
                                
 
                                if ((!xlayer->member_id || (!member->avatar_png_img &&
-                                                                                       xlayer->is_avatar &&
+                                                                                       xlayer->is_avatar && !xlayer->geometry.role_id &&
                                                                                        (conference->canvas_count > 1 || xlayer->member_id != (int)conference->video_floor_holder))) &&
                                        !xlayer->fnode && !xlayer->geometry.fileonly && !xlayer->geometry.res_id && !xlayer->geometry.flooronly) {
                                        switch_status_t lstatus = conference_video_attach_video_layer(member, canvas, i);