[svn-commits] file: branch 1.6.0 r107666 - in /branches/1.6.0: ./ main/features.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Mar 11 14:25:00 2008
New Revision: 107666

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107666
Log:
Merged revisions 107659 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r107659 | file | 2008-03-11 16:23:28 -0300 (Tue, 11 Mar 2008) | 12 lines

Merged revisions 107646 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r107646 | file | 2008-03-11 16:20:01 -0300 (Tue, 11 Mar 2008) | 4 lines

Make sure the visible indication is on the right channel so when the masquerade happens the proper indication is enacted.
(closes issue #11707)
Reported by: iam

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/features.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/features.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/features.c?view=diff&rev=107666&r1=107665&r2=107666
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Tue Mar 11 14:25:00 2008
@@ -1115,6 +1115,7 @@
 			return -1;
 		}
 		/* Make formats okay */
+		xferchan->visible_indication = transferer->visible_indication;
 		xferchan->readformat = transferee->readformat;
 		xferchan->writeformat = transferee->writeformat;
 		ast_channel_masquerade(xferchan, transferee);
@@ -1211,6 +1212,7 @@
 			return -1;
 		}
 		/* Make formats okay */
+		xferchan->visible_indication = transferer->visible_indication;
 		xferchan->readformat = transferee->readformat;
 		xferchan->writeformat = transferee->writeformat;
 		ast_channel_masquerade(xferchan, transferee);