[svn-commits] mmichelson: branch group/issue8824 r152256 - in /team/group/issue8824: ./ cha...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Oct 27 17:40:46 2008
New Revision: 152256

URL: http://svn.digium.com/view/asterisk?view=rev&rev=152256
Log:
resolve conflict and reset automerge


Modified:
    team/group/issue8824/   (props changed)
    team/group/issue8824/channels/chan_local.c

Propchange: team/group/issue8824/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/issue8824/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/issue8824/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 27 17:40:46 2008
@@ -1,1 +1,1 @@
-/trunk:1-152185
+/trunk:1-152253

Modified: team/group/issue8824/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/channels/chan_local.c?view=diff&rev=152256&r1=152255&r2=152256
==============================================================================
--- team/group/issue8824/channels/chan_local.c (original)
+++ team/group/issue8824/channels/chan_local.c Mon Oct 27 17:40:46 2008
@@ -520,6 +520,9 @@
 	ast_copy_connected_to_caller(&p->chan->cid, &p->owner->connected);
 	ast_copy_caller_to_connected(&p->chan->connected, &p->owner->cid);
 
+	p->chan->cid.cid_ani2 = p->owner->cid.cid_ani2;
+	p->chan->cid.cid_ton = p->owner->cid.cid_ton;
+	p->chan->cid.cid_tns = p->owner->cid.cid_tns;
 	ast_string_field_set(p->chan, language, p->owner->language);
 	ast_string_field_set(p->chan, accountcode, p->owner->accountcode);
 	ast_cdr_update(p->chan);