[svn-commits] tilghman: branch 1.6.0 r166956 - in /branches/1.6.0: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Dec 31 13:37:03 2008
New Revision: 166956

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

................
  r166954 | tilghman | 2008-12-31 13:34:28 -0600 (Wed, 31 Dec 2008) | 12 lines
  
  Merged revisions 166953 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r166953 | tilghman | 2008-12-31 13:20:35 -0600 (Wed, 31 Dec 2008) | 5 lines
    
    Also inherit the musiconhold class.
    (Closes #14153)
    Reported by: Jerry Geis, via the users list.
    Patch by: me (license 14)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_local.c

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

Modified: branches/1.6.0/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_local.c?view=diff&rev=166956&r1=166955&r2=166956
==============================================================================
--- branches/1.6.0/channels/chan_local.c (original)
+++ branches/1.6.0/channels/chan_local.c Wed Dec 31 13:37:03 2008
@@ -494,6 +494,7 @@
 	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_string_field_set(p->chan, musicclass, p->owner->musicclass);
 	ast_cdr_update(p->chan);
 	p->chan->cdrflags = p->owner->cdrflags;