Author: vdegtyarev
Date: Fri Mar 28 08:53:29 2014
New Revision: 1582638
URL: http://svn.apache.org/r1582638
Log:
Merge OPENMEETINGS-959 to trunk. "Choose Device" Dialog show (all) devices from
flash-settings
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
(contents, props changed)
Modified:
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1582638&r1=1582637&r2=1582638&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Fri Mar 28 08:53:29 2014
@@ -521,7 +521,7 @@
//fill list of Mics
var mics = Microphone.names;
- var foundStoredMic = fillDeviceList(cameras, availableMics,
"mic");
+ var foundStoredMic = fillDeviceList(mics, availableMics, "mic");
selectListItem(availableMics, foundStoredMic, mics.length > 0);
// settings
Propchange:
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Mar 28 08:53:29 2014
@@ -0,0 +1,5 @@
+/incubator/openmeetings/branches/video-components/WebContent/swf10/video/editRecordStreamSWF10.lzx:1220095-1239505
+/incubator/openmeetings/import/branches/dev/injection/WebContent/swf10/video/editRecordStreamSWF10.lzx:1219598-1219722
+/incubator/openmeetings/import/branches/dev/om_openjpa/WebContent/swf10/video/editRecordStreamSWF10.lzx:1219535-1219562
+/openmeetings/branches/3.0.x/WebContent/swf10/video/editRecordStreamSWF10.lzx:1582635
+/openmeetings/branches/OPENMEETINGS-745/WebContent/swf10/video/editRecordStreamSWF10.lzx:1512528-1512967
