diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml old mode 100644 new mode 100755 index 23e66a4916..944f038226 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml @@ -77,7 +77,7 @@ $Id: $ if (e.message.talking){ muteMeBtnImg.filters = [new GlowFilter(0x000000, 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)]; } else { - muteMeBtnImg.filters = [new GlowFilter(0x555555, 1, 6, 6, 2, BitmapFilterQuality.HIGH, true, true)]; + muteMeBtnImg.filters = []; } } } @@ -98,7 +98,8 @@ $Id: $ private function handleJoinedVoiceConferenceEvent(event:BBBEvent):void { if (UsersUtil.isMe(event.payload.userID)) { trace(LOG + "User has joined the conference using flash"); - updateMuteMeBtn(); + updateMuteMeBtn(); + muteMeBtnImg.filters = []; } } diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as index c54f8985fc..53317cbd42 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as @@ -58,6 +58,8 @@ package org.bigbluebutton.modules.phone.managers ResourceUtil.getInstance().getString("bbb.clientstatus.webrtc.title"), ResourceUtil.getInstance().getString("bbb.clientstatus.webrtc.message"))); } + + usingWebRTC = checkIfToUseWebRTC(); } private function isWebRTCSupported():Boolean { @@ -145,8 +147,6 @@ package org.bigbluebutton.modules.phone.managers public function handleJoinVoiceConferenceCommand(event:JoinVoiceConferenceCommand):void { trace(LOG + "handleJoinVoiceConferenceCommand - usingWebRTC: " + usingWebRTC + ", event.mic: " + event.mic); - usingWebRTC = checkIfToUseWebRTC(); - if (!usingWebRTC || !event.mic) return; if (options.skipCheck || echoTestDone) { diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml index 5042af0c60..98ddcfa607 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml @@ -191,7 +191,7 @@ if(data.talking && !rolledOver){ muteImg.filters = [new GlowFilter(0x000000, 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)]; }else{ - muteImg.filters = [new GlowFilter(0x555555, 1, 6, 6, 2, BitmapFilterQuality.HIGH, true, true)]; + muteImg.filters = []; } } }