aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-05-23 23:46:43 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-05-23 23:46:43 +0000
commit60d12a0e3d6e8151f03838b9b0be59110a55fc97 (patch)
tree3f3358eb2330d0ac718de2e284c3eee378069a6b /apps
parent756255148d2728155444310ce4f276681c6afc5b (diff)
Change 'u' back to 's' since it's required for both user and admin menus
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3048 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rwxr-xr-xapps/app_meetme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 290dff2ad..10190e1bd 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -65,7 +65,7 @@ static char *descrip =
" 'b' -- run AGI script specified in ${MEETME_AGI_BACKGROUND}\n"
" Default: conf-background.agi\n"
" (Note: This does not work with non-Zap channels in the same conference)\n"
-" 'u' -- send user to admin/user menu if '*' is received\n"
+" 's' -- Present menu (user or admin) when '*' is received ('send' to menu)\n"
" 'a' -- set admin mode\n";
static char *descrip2 =
@@ -1094,7 +1094,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
confflags |= CONFFLAG_MONITOR;
if (strchr(inflags, 'p'))
confflags |= CONFFLAG_POUNDEXIT;
- if (strchr(inflags, 'u'))
+ if (strchr(inflags, 's'))
confflags |= CONFFLAG_STARMENU;
if (strchr(inflags, 't'))
confflags |= CONFFLAG_TALKER;