- fix merge exceptions

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala

@@ -162,8 +162,8 @@ class MeetingActor(
     MeetingStatus2x.unmuteMeeting(liveMeeting.status)
   }
 
-    // Set webcamsOnlyForModerator property in case we didn't after meeting creation
-    MeetingStatus2x.setWebcamsOnlyForModerator(liveMeeting.status, liveMeeting.props.usersProp.webcamsOnlyForModerator)
+  // Set webcamsOnlyForModerator property in case we didn't after meeting creation
+  MeetingStatus2x.setWebcamsOnlyForModerator(liveMeeting.status, liveMeeting.props.usersProp.webcamsOnlyForModerator)
 
   /*******************************************************************/
   // Helper to create fake users for testing (ralam jan 5, 2018)
@@ -226,7 +226,7 @@ class MeetingActor(
       case m: MeetingActivityResponseCmdMsg => state = usersApp.handleMeetingActivityResponseCmdMsg(m, state)
       case m: LogoutAndEndMeetingCmdMsg => usersApp.handleLogoutAndEndMeetingCmdMsg(m, state)
       case m: SetRecordingStatusCmdMsg => usersApp.handleSetRecordingStatusCmdMsg(m)
-      case m: GetWebcamsOnlyForModeratorReqMsg    => usersApp.handleGetWebcamsOnlyForModeratorReqMsg(m)
+      case m: GetWebcamsOnlyForModeratorReqMsg => usersApp.handleGetWebcamsOnlyForModeratorReqMsg(m)
       case m: UpdateWebcamsOnlyForModeratorCmdMsg => usersApp.handleUpdateWebcamsOnlyForModeratorCmdMsg(m)
       case m: GetRecordingStatusReqMsg => usersApp.handleGetRecordingStatusReqMsg(m)
       case m: ChangeUserEmojiCmdMsg => handleChangeUserEmojiCmdMsg(m)

akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/MeetingStatus2x.scala

@@ -87,7 +87,7 @@ class MeetingStatus2x {
   private var voiceRecordingFilename: String = ""
 
   private var extension = new MeetingExtensionProp
-  
+
   private var webcamsOnlyForModerator = false
 
 }

akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala

@@ -463,7 +463,7 @@ class RedisRecorderActor(val system: ActorSystem)
 
     record(msg.header.meetingId, ev.toMap)
   }
-  
+
   private def handleWebcamsOnlyForModeratorChangedEvtMsg(msg: WebcamsOnlyForModeratorChangedEvtMsg) {
     val ev = new WebcamsOnlyForModeratorRecordEvent()
     ev.setMeetingId(msg.header.meetingId)

bbb-apps-common/src/main/scala/org/bigbluebutton/client/meeting/AllowedMessageNames.scala

@@ -35,7 +35,10 @@ object AllowedMessageNames {
       SetGuestPolicyCmdMsg.NAME,
       GuestsWaitingApprovedMsg.NAME,
 
-      // Voice
+      // Webcams
+      GetWebcamsOnlyForModeratorReqMsg.NAME,
+
+        // Voice
       MuteMeetingCmdMsg.NAME,
       MuteAllExceptPresentersCmdMsg.NAME,
       MuteUserCmdMsg.NAME,
@@ -105,4 +108,4 @@ object AllowedMessageNames {
         // System
       ClientToServerLatencyTracerMsg.NAME
   )
-}
+}

bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml

@@ -46,7 +46,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	<fx:Declarations>
 		<EventHandlers type="{VideoModuleStartEvent.START}">
 			<ObjectBuilder generator="{VideoEventMapDelegate}" cache="global" constructorArguments="{scope.dispatcher}"/>
-			<MethodInvoker generator="{VideoEventMapDelegate}" method="start" arguments="{event.uri}"/>
+			<MethodInvoker generator="{VideoEventMapDelegate}" method="start"/>
 			<EventAnnouncer generator="{ConnectAppEvent}" type="{ConnectAppEvent.CONNECT_VIDEO_APP}" />
 		</EventHandlers>