Author: solomax
Date: Tue Jul 12 18:18:27 2016
New Revision: 1752324
URL: http://svn.apache.org/viewvc?rev=1752324&view=rev
Log:
[OPENMEETINGS-1435] whiteboard pointer displays correct name
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1752324&r1=1752323&r2=1752324&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Tue Jul 12 18:18:27 2016
@@ -1432,10 +1432,12 @@
<method name="nickNameSet" args="value">
if ($debug) Debug.write("nickNameSet: ", value);
- canvas.currentClient = value;
- canvas.setAttribute('mail', value.email);
- canvas.setAttribute('firstName', value.firstname);
- canvas.setAttribute('lastName', value.lastname);
+ if (canvas.publicSID == value.publicSID) {
+ canvas.currentClient = value;
+ canvas.setAttribute('mail', value.email);
+ canvas.setAttribute('firstName', value.firstname);
+ canvas.setAttribute('lastName', value.lastname);
+ }
var v =
canvas.commonVideoViewContent.getVideoObjectByPublicSID(value.publicSID);
if (v != null) {
v.setAttribute('chatpartnername',
canvas.currentClient.firstname + ' ' + canvas.currentClient.lastname);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1752324&r1=1752323&r2=1752324&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Tue Jul 12 18:18:27 2016
@@ -1242,10 +1242,12 @@
<method name="nickNameSet" args="value">
if ($debug) Debug.write("nickNameSet: ", value);
- canvas.currentClient = value;
- canvas.setAttribute('mail', value.email);
- canvas.setAttribute('firstName', value.firstname);
- canvas.setAttribute('lastName', value.lastname);
+ if (canvas.publicSID == value.publicSID) {
+ canvas.currentClient = value;
+ canvas.setAttribute('mail', value.email);
+ canvas.setAttribute('firstName', value.firstname);
+ canvas.setAttribute('lastName', value.lastname);
+ }
var v =
canvas.commonVideoViewContent.getVideoObjectByPublicSID(value.publicSID);
if (v != null) {
v.setAttribute('chatpartnername',
canvas.currentClient.firstname + ' ' + canvas.currentClient.lastname);
