automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-08-02 00:03:25 +00:00
parent c535882053
commit 561838ab6a
2 changed files with 12 additions and 4 deletions

View File

@@ -1472,6 +1472,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
config->start_sound = NULL;
config->firstpass = 0;
}
config->start_time = ast_tvnow();
config->feature_timer = featuredigittimeout;
ast_log(LOG_DEBUG, "Set time limit to %ld\n", config->feature_timer);
}